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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- 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 --]