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

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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/misc/Makefile between commit
03f582a93ecca6e9584b622570022abf08ed03ec ("misc: Add ab8500 pwm driver")
from the mfd tree and commit b6de6c8f5a6fc18c5c67bb4e53f3d0cfd266b07b
("add Packet hub driver for Topcliff Platform controller hub") from the
driver-core tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

P.S. Greg, I noticed that the driver-core patch above does not have a SOB
from its author.

diff --cc drivers/misc/Makefile
index 33bc441,21b4761..0000000
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -35,4 -35,4 +35,5 @@@ obj-y				+= eeprom
  obj-y				+= cb710/
  obj-$(CONFIG_VMWARE_BALLOON)	+= vmware_balloon.o
  obj-$(CONFIG_ARM_CHARLCD)	+= arm-charlcd.o
 +obj-$(CONFIG_AB8500_PWM)	+= ab8500-pwm.o
+ obj-$(CONFIG_PCH_PHUB)		+= pch_phub.o

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

[Greg KH]

On Tue, Sep 14, 2010 at 12:25:10PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/misc/Makefile between commit
> 03f582a93ecca6e9584b622570022abf08ed03ec ("misc: Add ab8500 pwm driver")
> from the mfd tree and commit b6de6c8f5a6fc18c5c67bb4e53f3d0cfd266b07b
> ("add Packet hub driver for Topcliff Platform controller hub") from the
> driver-core tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

Fix looks fine to me, thanks.

greg k-h

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

[Greg KH]

On Mon, Nov 10, 2014 at 03:24:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mfd/syscon.c between commit d4ad08b424c1 ("mfd: syscon:
> Decouple syscon interface from platform devices") from the mfd tree and
> commit 78a835416ad6 ("mfd: drop owner assignment from
> platform_drivers") 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@canb.auug.org.au
> 
> diff --cc drivers/mfd/syscon.c
> index 72373b113885,e85c052b302c..000000000000
> --- a/drivers/mfd/syscon.c
> +++ b/drivers/mfd/syscon.c
> @@@ -219,7 -166,7 +219,6 @@@ static const struct platform_device_id 
>   static struct platform_driver syscon_driver = {
>   	.driver = {
>   		.name = "syscon",
> - 		.owner = THIS_MODULE,
>  -		.of_match_table = of_syscon_match,
>   	},
>   	.probe		= syscon_probe,
>   	.id_table	= syscon_ids,


Looks good, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 911 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/syscon.c between commit d4ad08b424c1 ("mfd: syscon:
Decouple syscon interface from platform devices") from the mfd tree and
commit 78a835416ad6 ("mfd: drop owner assignment from
platform_drivers") 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@canb.auug.org.au

diff --cc drivers/mfd/syscon.c
index 72373b113885,e85c052b302c..000000000000
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@@ -219,7 -166,7 +219,6 @@@ static const struct platform_device_id 
  static struct platform_driver syscon_driver = {
  	.driver = {
  		.name = "syscon",
- 		.owner = THIS_MODULE,
 -		.of_match_table = of_syscon_match,
  	},
  	.probe		= syscon_probe,
  	.id_table	= syscon_ids,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Greg KH]

On Thu, Nov 29, 2012 at 02:43:02PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/gpio/gpio-tps6586x.c between commit fe39f2f4dc84 ("mfd: Implement
> tps6586x gpio_to_irq") from the mfd tree and commit 3836309d9346 ("gpio:
> 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).

Looks good, thanks.

greg k-h

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

[Greg KH]

On Thu, Nov 29, 2012 at 02:47:12PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mfd/ab8500-core.c between commit 8ae754ebd5ed ("mfd: ab8500-core:
> Remove unused ab8500-gpio IRQ ranges") from the mfd tree and commit
> a9e9ce4c4167 ("mfd: remove use of __devinitdata") from the driver-core
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h

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

[Greg KH]

On Thu, Nov 29, 2012 at 02:50:39PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mfd/da9052-core.c between commit 8bad1abd6303 ("mfd: da9052:
> Introduce da9052-irq.c") from the mfd tree and commit a9e9ce4c4167 ("mfd:
> remove use of __devinitdata") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h

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

[Greg KH]

On Thu, Nov 29, 2012 at 02:57:14PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mfd/sta2x11-mfd.c between various commits from the mfd tree and
> commits f791be492f76 ("mfd: remove use of __devinit"), a9e9ce4c4167
> ("mfd: remove use of __devinitdata") and a73e5df16b52 ("mfd: remove use
> of __devinitconst") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h

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

[Greg KH]

On Thu, Nov 29, 2012 at 03:00:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mfd/tps65090.c between various commits from the mfd tree and
> commits 84449216b01f ("mfd: remove use of __devexit_p"), f791be492f76
> ("mfd: remove use of __devinit") and 4740f73fe538 ("mfd: remove use of
> __devexit") from the driver-core tree.
> 
> I fixed it up (by using the mfd tree version) and can carry the fix as
> necessary (no action is required).

Looks good, thanks.

greg k-h

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

[Greg KH]

On Thu, Nov 29, 2012 at 03:18:04PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/power/da9052-battery.c between commit 4b5edf7887c6 ("power:
> da9052-battery: Convert to the new da9052 interrupt functions") from the
> mfd 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).

Looks good, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1769 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/power/da9052-battery.c between commit 4b5edf7887c6 ("power:
da9052-battery: Convert to the new da9052 interrupt functions") from the
mfd 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@canb.auug.org.au

diff --cc drivers/power/da9052-battery.c
index 3972dc0,bb0df89..0000000
--- a/drivers/power/da9052-battery.c
+++ b/drivers/power/da9052-battery.c
@@@ -578,16 -576,7 +578,16 @@@ static char *da9052_bat_irqs[] = 
  	"CHG END",
  };
  
 +static int da9052_bat_irq_bits[] = {
 +	DA9052_IRQ_TBAT,
 +	DA9052_IRQ_DCIN,
 +	DA9052_IRQ_DCINREM,
 +	DA9052_IRQ_VBUS,
 +	DA9052_IRQ_VBUSREM,
 +	DA9052_IRQ_CHGEND,
 +};
 +
- static s32 __devinit da9052_bat_probe(struct platform_device *pdev)
+ static s32 da9052_bat_probe(struct platform_device *pdev)
  {
  	struct da9052_pdata *pdata;
  	struct da9052_battery *bat;
@@@ -638,14 -630,16 +638,14 @@@ err
  	kfree(bat);
  	return ret;
  }
- static int __devexit da9052_bat_remove(struct platform_device *pdev)
+ static int da9052_bat_remove(struct platform_device *pdev)
  {
  	int i;
 -	int irq;
  	struct da9052_battery *bat = platform_get_drvdata(pdev);
  
 -	for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++) {
 -		irq = platform_get_irq_byname(pdev, da9052_bat_irqs[i]);
 -		free_irq(bat->da9052->irq_base + irq, bat);
 -	}
 +	for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++)
 +		da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);
 +
  	power_supply_unregister(&bat->psy);
  	kfree(bat);
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/tps65090.c between various commits from the mfd tree and
commits 84449216b01f ("mfd: remove use of __devexit_p"), f791be492f76
("mfd: remove use of __devinit") and 4740f73fe538 ("mfd: remove use of
__devexit") from the driver-core tree.

I fixed it up (by using the mfd tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 5976 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/sta2x11-mfd.c between various commits from the mfd tree and
commits f791be492f76 ("mfd: remove use of __devinit"), a9e9ce4c4167
("mfd: remove use of __devinitdata") and a73e5df16b52 ("mfd: remove use
of __devinitconst") 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@canb.auug.org.au

diff --cc drivers/mfd/sta2x11-mfd.c
index 6fb0938,d6284ca..0000000
--- a/drivers/mfd/sta2x11-mfd.c
+++ b/drivers/mfd/sta2x11-mfd.c
@@@ -76,9 -69,8 +76,9 @@@ static struct sta2x11_mfd *sta2x11_mfd_
  	return NULL;
  }
  
- static int __devinit sta2x11_mfd_add(struct pci_dev *pdev, gfp_t flags)
+ static int sta2x11_mfd_add(struct pci_dev *pdev, gfp_t flags)
  {
 +	int i;
  	struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev);
  	struct sta2x11_instance *instance;
  
@@@ -458,73 -305,42 +458,73 @@@ enum mfd0_bar1_cells 
  		.flags = IORESOURCE_MEM, \
  		}
  
- static const __devinitconst struct resource gpio_resources[] = {
+ static const struct resource gpio_resources[] = {
  	{
 -		.name = "sta2x11_gpio", /* 4 consecutive cells, 1 driver */
 +		/* 4 consecutive cells, 1 driver */
 +		.name = STA2X11_MFD_GPIO_NAME,
  		.start = 0,
  		.end = (4 * 4096) - 1,
  		.flags = IORESOURCE_MEM,
  	}
  };
- static const __devinitconst struct resource sctl_resources[] = {
+ static const struct resource sctl_resources[] = {
 -	CELL_4K("sta2x11-sctl", STA2X11_SCTL),
 +	CELL_4K(STA2X11_MFD_SCTL_NAME, STA2X11_SCTL),
  };
- static const __devinitconst struct resource scr_resources[] = {
+ static const struct resource scr_resources[] = {
 -	CELL_4K("sta2x11-scr", STA2X11_SCR),
 +	CELL_4K(STA2X11_MFD_SCR_NAME, STA2X11_SCR),
  };
- static const __devinitconst struct resource time_resources[] = {
+ static const struct resource time_resources[] = {
 -	CELL_4K("sta2x11-time", STA2X11_TIME),
 +	CELL_4K(STA2X11_MFD_TIME_NAME, STA2X11_TIME),
  };
  
- static const __devinitconst struct resource apbreg_resources[] = {
+ static const struct resource apbreg_resources[] = {
 -	CELL_4K("sta2x11-apbreg", STA2X11_APBREG),
 +	CELL_4K(STA2X11_MFD_APBREG_NAME, STA2X11_APBREG),
  };
  
  #define DEV(_name, _r) \
  	{ .name = _name, .num_resources = ARRAY_SIZE(_r), .resources = _r, }
  
- static __devinitdata struct mfd_cell sta2x11_mfd0_bar0[] = {
 -static struct mfd_cell sta2x11_mfd_bar0[] = {
 -	DEV("sta2x11-gpio", gpio_resources), /* offset 0: we add pdata later */
 -	DEV("sta2x11-sctl", sctl_resources),
 -	DEV("sta2x11-scr", scr_resources),
 -	DEV("sta2x11-time", time_resources),
++static struct mfd_cell sta2x11_mfd0_bar0[] = {
 +	/* offset 0: we add pdata later */
 +	DEV(STA2X11_MFD_GPIO_NAME, gpio_resources),
 +	DEV(STA2X11_MFD_SCTL_NAME, sctl_resources),
 +	DEV(STA2X11_MFD_SCR_NAME,  scr_resources),
 +	DEV(STA2X11_MFD_TIME_NAME, time_resources),
  };
  
- static __devinitdata struct mfd_cell sta2x11_mfd0_bar1[] = {
 -static struct mfd_cell sta2x11_mfd_bar1[] = {
 -	DEV("sta2x11-apbreg", apbreg_resources),
++static struct mfd_cell sta2x11_mfd0_bar1[] = {
 +	DEV(STA2X11_MFD_APBREG_NAME, apbreg_resources),
  };
  
 +/* Mfd 1 devices */
 +
 +/* Mfd 1, Bar 0 */
 +enum mfd1_bar0_cells {
 +	STA2X11_VIC = 0,
 +};
 +
 +/* Mfd 1, Bar 1 */
 +enum mfd1_bar1_cells {
 +	STA2X11_APB_SOC_REGS = 0,
 +};
 +
- static const __devinitconst struct resource vic_resources[] = {
++static const struct resource vic_resources[] = {
 +	CELL_4K(STA2X11_MFD_VIC_NAME, STA2X11_VIC),
 +};
 +
- static const __devinitconst struct resource apb_soc_regs_resources[] = {
++static const struct resource apb_soc_regs_resources[] = {
 +	CELL_4K(STA2X11_MFD_APB_SOC_REGS_NAME, STA2X11_APB_SOC_REGS),
 +};
 +
- static __devinitdata struct mfd_cell sta2x11_mfd1_bar0[] = {
++static struct mfd_cell sta2x11_mfd1_bar0[] = {
 +	DEV(STA2X11_MFD_VIC_NAME, vic_resources),
 +};
 +
- static __devinitdata struct mfd_cell sta2x11_mfd1_bar1[] = {
++static struct mfd_cell sta2x11_mfd1_bar1[] = {
 +	DEV(STA2X11_MFD_APB_SOC_REGS_NAME, apb_soc_regs_resources),
 +};
 +
 +
  static int sta2x11_mfd_suspend(struct pci_dev *pdev, pm_message_t state)
  {
  	pci_save_state(pdev);
@@@ -547,59 -363,7 +547,59 @@@ static int sta2x11_mfd_resume(struct pc
  	return 0;
  }
  
 +struct sta2x11_mfd_bar_setup_data {
 +	struct mfd_cell *cells;
 +	int ncells;
 +};
 +
 +struct sta2x11_mfd_setup_data {
 +	struct sta2x11_mfd_bar_setup_data bars[2];
 +};
 +
 +#define STA2X11_MFD0 0
 +#define STA2X11_MFD1 1
 +
 +static struct sta2x11_mfd_setup_data mfd_setup_data[] = {
 +	/* Mfd 0: gpio, sctl, scr, timers / apbregs */
 +	[STA2X11_MFD0] = {
 +		.bars = {
 +			[0] = {
 +				.cells = sta2x11_mfd0_bar0,
 +				.ncells = ARRAY_SIZE(sta2x11_mfd0_bar0),
 +			},
 +			[1] = {
 +				.cells = sta2x11_mfd0_bar1,
 +				.ncells = ARRAY_SIZE(sta2x11_mfd0_bar1),
 +			},
 +		},
 +	},
 +	/* Mfd 1: vic / apb-soc-regs */
 +	[STA2X11_MFD1] = {
 +		.bars = {
 +			[0] = {
 +				.cells = sta2x11_mfd1_bar0,
 +				.ncells = ARRAY_SIZE(sta2x11_mfd1_bar0),
 +			},
 +			[1] = {
 +				.cells = sta2x11_mfd1_bar1,
 +				.ncells = ARRAY_SIZE(sta2x11_mfd1_bar1),
 +			},
 +		},
 +	},
 +};
 +
- static void __devinit sta2x11_mfd_setup(struct pci_dev *pdev,
++static void sta2x11_mfd_setup(struct pci_dev *pdev,
 +					struct sta2x11_mfd_setup_data *sd)
 +{
 +	int i, j;
 +	for (i = 0; i < ARRAY_SIZE(sd->bars); i++)
 +		for (j = 0; j < sd->bars[i].ncells; j++) {
 +			sd->bars[i].cells[j].pdata_size = sizeof(pdev);
 +			sd->bars[i].cells[j].platform_data = &pdev;
 +		}
 +}
 +
- static int __devinit sta2x11_mfd_probe(struct pci_dev *pdev,
+ static int sta2x11_mfd_probe(struct pci_dev *pdev,
  				       const struct pci_device_id *pci_id)
  {
  	int err, i;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2416 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/da9052-core.c between commit 8bad1abd6303 ("mfd: da9052:
Introduce da9052-irq.c") from the mfd tree and commit a9e9ce4c4167 ("mfd:
remove use of __devinitdata") 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@canb.auug.org.au

diff --cc drivers/mfd/da9052-core.c
index 2153f9bb,689b747..0000000
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@@ -427,7 -447,75 +427,7 @@@ int da9052_adc_read_temp(struct da9052 
  }
  EXPORT_SYMBOL_GPL(da9052_adc_read_temp);
  
- static struct mfd_cell __devinitdata da9052_subdev_info[] = {
 -static struct resource da9052_rtc_resource = {
 -	.name = "ALM",
 -	.start = DA9052_IRQ_ALARM,
 -	.end   = DA9052_IRQ_ALARM,
 -	.flags = IORESOURCE_IRQ,
 -};
 -
 -static struct resource da9052_onkey_resource = {
 -	.name = "ONKEY",
 -	.start = DA9052_IRQ_NONKEY,
 -	.end   = DA9052_IRQ_NONKEY,
 -	.flags = IORESOURCE_IRQ,
 -};
 -
 -static struct resource da9052_bat_resources[] = {
 -	{
 -		.name = "BATT TEMP",
 -		.start = DA9052_IRQ_TBAT,
 -		.end   = DA9052_IRQ_TBAT,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "DCIN DET",
 -		.start = DA9052_IRQ_DCIN,
 -		.end   = DA9052_IRQ_DCIN,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "DCIN REM",
 -		.start = DA9052_IRQ_DCINREM,
 -		.end   = DA9052_IRQ_DCINREM,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "VBUS DET",
 -		.start = DA9052_IRQ_VBUS,
 -		.end   = DA9052_IRQ_VBUS,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "VBUS REM",
 -		.start = DA9052_IRQ_VBUSREM,
 -		.end   = DA9052_IRQ_VBUSREM,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "CHG END",
 -		.start = DA9052_IRQ_CHGEND,
 -		.end   = DA9052_IRQ_CHGEND,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -};
 -
 -static struct resource da9052_tsi_resources[] = {
 -	{
 -		.name = "PENDWN",
 -		.start = DA9052_IRQ_PENDOWN,
 -		.end   = DA9052_IRQ_PENDOWN,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -	{
 -		.name = "TSIRDY",
 -		.start = DA9052_IRQ_TSIREADY,
 -		.end   = DA9052_IRQ_TSIREADY,
 -		.flags = IORESOURCE_IRQ,
 -	},
 -};
 -
+ static struct mfd_cell da9052_subdev_info[] = {
  	{
  		.name = "da9052-regulator",
  		.id = 1,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3130 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/ab8500-core.c between commit 8ae754ebd5ed ("mfd: ab8500-core:
Remove unused ab8500-gpio IRQ ranges") from the mfd tree and commit
a9e9ce4c4167 ("mfd: remove use of __devinitdata") 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@canb.auug.org.au

diff --cc drivers/mfd/ab8500-core.c
index 3385db6,127b00a..0000000
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@@ -591,7 -591,39 +591,7 @@@ int ab8500_suspend(struct ab8500 *ab850
  		return 0;
  }
  
- static struct resource __devinitdata ab8500_gpadc_resources[] = {
 -/* AB8500 GPIO Resources */
 -static struct resource __devinitdata ab8500_gpio_resources[] = {
 -	{
 -		.name	= "GPIO_INT6",
 -		.start	= AB8500_INT_GPIO6R,
 -		.end	= AB8500_INT_GPIO41F,
 -		.flags	= IORESOURCE_IRQ,
 -	}
 -};
 -
 -/* AB9540 GPIO Resources */
 -static struct resource __devinitdata ab9540_gpio_resources[] = {
 -	{
 -		.name	= "GPIO_INT6",
 -		.start	= AB8500_INT_GPIO6R,
 -		.end	= AB8500_INT_GPIO41F,
 -		.flags	= IORESOURCE_IRQ,
 -	},
 -	{
 -		.name	= "GPIO_INT14",
 -		.start	= AB9540_INT_GPIO50R,
 -		.end	= AB9540_INT_GPIO54R,
 -		.flags	= IORESOURCE_IRQ,
 -	},
 -	{
 -		.name	= "GPIO_INT15",
 -		.start	= AB9540_INT_GPIO50F,
 -		.end	= AB9540_INT_GPIO54F,
 -		.flags	= IORESOURCE_IRQ,
 -	}
 -};
 -
+ static struct resource ab8500_gpadc_resources[] = {
  	{
  		.name	= "HW_CONV_END",
  		.start	= AB8500_INT_GP_HW_ADC_CONV_END,
@@@ -1010,16 -1038,11 +1010,16 @@@ static struct mfd_cell abx500_common_de
  	},
  };
  
- static struct mfd_cell __devinitdata ab8500_bm_devs[] = {
+ static struct mfd_cell ab8500_bm_devs[] = {
  	{
  		.name = "ab8500-charger",
 +		.of_compatible = "stericsson,ab8500-charger",
  		.num_resources = ARRAY_SIZE(ab8500_charger_resources),
  		.resources = ab8500_charger_resources,
 +#ifndef CONFIG_OF
 +		.platform_data = &ab8500_bm_data,
 +		.pdata_size = sizeof(ab8500_bm_data),
 +#endif
  	},
  	{
  		.name = "ab8500-btemp",
@@@ -1070,9 -1080,11 +1070,9 @@@ static struct mfd_cell ab8500_devs[] = 
  	},
  };
  
- static struct mfd_cell __devinitdata ab9540_devs[] = {
+ static struct mfd_cell ab9540_devs[] = {
  	{
  		.name = "ab8500-gpio",
 -		.num_resources = ARRAY_SIZE(ab9540_gpio_resources),
 -		.resources = ab9540_gpio_resources,
  	},
  	{
  		.name = "ab9540-usb",
@@@ -1445,9 -1460,20 +1445,9 @@@ static int ab8500_probe(struct platform
  		dev_err(ab8500->dev, "error creating sysfs entries\n");
  
  	return ret;
 -
 -out_freeirq:
 -	free_irq(ab8500->irq, ab8500);
 -out_freeoldmask:
 -	kfree(ab8500->oldmask);
 -out_freemask:
 -	kfree(ab8500->mask);
 -out_free_ab8500:
 -	kfree(ab8500);
 -
 -	return ret;
  }
  
- static int __devexit ab8500_remove(struct platform_device *pdev)
+ static int ab8500_remove(struct platform_device *pdev)
  {
  	struct ab8500 *ab8500 = platform_get_drvdata(pdev);
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/gpio/gpio-tps6586x.c between commit fe39f2f4dc84 ("mfd: Implement
tps6586x gpio_to_irq") from the mfd tree and commit 3836309d9346 ("gpio:
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@canb.auug.org.au

diff --cc drivers/gpio/gpio-tps6586x.c
index 62e9e1c,c1b82da..0000000
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@@ -80,15 -80,7 +80,15 @@@ static int tps6586x_gpio_output(struct 
  				val, mask);
  }
  
 +static int tps6586x_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
 +{
 +	struct tps6586x_gpio *tps6586x_gpio = to_tps6586x_gpio(gc);
 +
 +	return tps6586x_irq_get_virq(tps6586x_gpio->parent,
 +				TPS6586X_INT_PLDO_0 + offset);
 +}
 +
- static int __devinit tps6586x_gpio_probe(struct platform_device *pdev)
+ static int tps6586x_gpio_probe(struct platform_device *pdev)
  {
  	struct tps6586x_platform_data *pdata;
  	struct tps6586x_gpio *tps6586x_gpio;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]