linux-next: manual merge of the driver-core tree with the batterytree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/power/max8925_power.c between commit eba3b670a916
("max8925_power: Add support for device-tree initialization") from the
battery tree and commit c8afa6406e60 ("power: remove use of __devinit")
from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/power/max8925_power.c
index b5a3ccb,1a075f1..0000000
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@@ -427,55 -426,7 +427,55 @@@ static int max8925_deinit_charger(struc
  	return 0;
  }
  
 +#ifdef CONFIG_OF
 +static struct max8925_power_pdata *
 +max8925_power_dt_init(struct platform_device *pdev)
 +{
 +	struct device_node *nproot = pdev->dev.parent->of_node;
 +	struct device_node *np;
 +	int batt_detect;
 +	int topoff_threshold;
 +	int fast_charge;
 +	int no_temp_support;
 +	int no_insert_detect;
 +	struct max8925_power_pdata *pdata;
 +
 +	if (!nproot)
 +		return pdev->dev.platform_data;
 +
 +	np = of_find_node_by_name(nproot, "charger");
 +	if (!np) {
 +		dev_err(&pdev->dev, "failed to find charger node\n");
 +		return NULL;
 +	}
 +
 +	pdata = devm_kzalloc(&pdev->dev,
 +			sizeof(struct max8925_power_pdata),
 +			GFP_KERNEL);
 +
 +	of_property_read_u32(np, "topoff-threshold", &topoff_threshold);
 +	of_property_read_u32(np, "batt-detect", &batt_detect);
 +	of_property_read_u32(np, "fast-charge", &fast_charge);
 +	of_property_read_u32(np, "no-insert-detect", &no_insert_detect);
 +	of_property_read_u32(np, "no-temp-support", &no_temp_support);
 +
 +	pdata->batt_detect = batt_detect;
 +	pdata->fast_charge = fast_charge;
 +	pdata->topoff_threshold = topoff_threshold;
 +	pdata->no_insert_detect = no_insert_detect;
 +	pdata->no_temp_support = no_temp_support;
 +
 +	return pdata;
 +}
 +#else
 +static struct max8925_power_pdata *
 +max8925_power_dt_init(struct platform_device *pdev)
 +{
 +	return pdev->dev.platform_data;
 +}
 +#endif
 +
- static __devinit int max8925_power_probe(struct platform_device *pdev)
+ static int max8925_power_probe(struct platform_device *pdev)
  {
  	struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
  	struct max8925_power_pdata *pdata = NULL;

Attachment: pgp00000.pgp
Description: PGP signature