Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65e52359 authored by Andres Salomon's avatar Andres Salomon Committed by Samuel Ortiz
Browse files

mfd: Rename platform_data field of mfd_cell to mfd_data 



Rename the platform_data variable to imply a distinction between
common platform_data driver usage (typically accessed via
pdev->dev.platform_data) and the way MFD passes data down to
clients (using a wrapper named mfd_get_data).

All clients have already been changed to use the wrapper function,
so this can be a quick single-commit change that only touches things
in drivers/mfd.

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 40e03f57

drivers/mfd/ab3100-core.c

+1 −1
Original line number Diff line number Diff line
@@ -950,7 +950,7 @@ static int __devinit ab3100_probe(struct i2c_client *client, 


	/* Set up and register the platform devices. */

	for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++)

		ab3100_devs[i].platform_data = ab3100_plf_data;

		ab3100_devs[i].mfd_data = ab3100_plf_data;



	err = mfd_add_devices(&client->dev, 0, ab3100_devs,

		ARRAY_SIZE(ab3100_devs), NULL, 0);

drivers/mfd/ab3550-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ static int __init ab3550_probe(struct i2c_client *client, 


	/* Set up and register the platform devices. */

	for (i = 0; i < AB3550_NUM_DEVICES; i++)

		ab3550_devs[i].platform_data = ab3550_plf_data->dev_data[i];

		ab3550_devs[i].mfd_data = ab3550_plf_data->dev_data[i];



	err = mfd_add_devices(&client->dev, 0, ab3550_devs,

		ARRAY_SIZE(ab3550_devs), NULL,

drivers/mfd/janz-cmodio.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv, 


	/* Add platform data */

	pdata->modno = modno;

	cell->platform_data = pdata;

	cell->mfd_data = pdata;



	/* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */

	res->flags = IORESOURCE_MEM;

drivers/mfd/mc13xxx-core.c

+1 −1
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static int mc13xxx_add_subdevice_pdata(struct mc13xxx *mc13xxx, 
	const char *name = mc13xxx_get_chipname(mc13xxx);



	struct mfd_cell cell = {

		.platform_data = pdata,

		.mfd_data = pdata,

	};



	/* there is no asnprintf in the kernel :-( */

drivers/mfd/timberdale.c

+27 −27
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { 
		.name = "timb-dma",

		.num_resources = ARRAY_SIZE(timberdale_dma_resources),

		.resources = timberdale_dma_resources,

		.platform_data = &timb_dma_platform_data,

		.mfd_data = &timb_dma_platform_data,

	},

	{

		.name = "timb-uart",
@@ -395,37 +395,37 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { 
		.name = "xiic-i2c",

		.num_resources = ARRAY_SIZE(timberdale_xiic_resources),

		.resources = timberdale_xiic_resources,

		.platform_data = &timberdale_xiic_platform_data,

		.mfd_data = &timberdale_xiic_platform_data,

	},

	{

		.name = "timb-gpio",

		.num_resources = ARRAY_SIZE(timberdale_gpio_resources),

		.resources = timberdale_gpio_resources,

		.platform_data = &timberdale_gpio_platform_data,

		.mfd_data = &timberdale_gpio_platform_data,

	},

	{

		.name = "timb-video",

		.num_resources = ARRAY_SIZE(timberdale_video_resources),

		.resources = timberdale_video_resources,

		.platform_data = &timberdale_video_platform_data,

		.mfd_data = &timberdale_video_platform_data,

	},

	{

		.name = "timb-radio",

		.num_resources = ARRAY_SIZE(timberdale_radio_resources),

		.resources = timberdale_radio_resources,

		.platform_data = &timberdale_radio_platform_data,

		.mfd_data = &timberdale_radio_platform_data,

	},

	{

		.name = "xilinx_spi",

		.num_resources = ARRAY_SIZE(timberdale_spi_resources),

		.resources = timberdale_spi_resources,

		.platform_data = &timberdale_xspi_platform_data,

		.mfd_data = &timberdale_xspi_platform_data,

	},

	{

		.name = "ks8842",

		.num_resources = ARRAY_SIZE(timberdale_eth_resources),

		.resources = timberdale_eth_resources,

		.platform_data = &timberdale_ks8842_platform_data,

		.mfd_data = &timberdale_ks8842_platform_data,

	},

};
@@ -434,7 +434,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { 
		.name = "timb-dma",

		.num_resources = ARRAY_SIZE(timberdale_dma_resources),

		.resources = timberdale_dma_resources,

		.platform_data = &timb_dma_platform_data,

		.mfd_data = &timb_dma_platform_data,

	},

	{

		.name = "timb-uart",
@@ -450,13 +450,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { 
		.name = "xiic-i2c",

		.num_resources = ARRAY_SIZE(timberdale_xiic_resources),

		.resources = timberdale_xiic_resources,

		.platform_data = &timberdale_xiic_platform_data,

		.mfd_data = &timberdale_xiic_platform_data,

	},

	{

		.name = "timb-gpio",

		.num_resources = ARRAY_SIZE(timberdale_gpio_resources),

		.resources = timberdale_gpio_resources,

		.platform_data = &timberdale_gpio_platform_data,

		.mfd_data = &timberdale_gpio_platform_data,

	},

	{

		.name = "timb-mlogicore",
@@ -467,25 +467,25 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { 
		.name = "timb-video",

		.num_resources = ARRAY_SIZE(timberdale_video_resources),

		.resources = timberdale_video_resources,

		.platform_data = &timberdale_video_platform_data,

		.mfd_data = &timberdale_video_platform_data,

	},

	{

		.name = "timb-radio",

		.num_resources = ARRAY_SIZE(timberdale_radio_resources),

		.resources = timberdale_radio_resources,

		.platform_data = &timberdale_radio_platform_data,

		.mfd_data = &timberdale_radio_platform_data,

	},

	{

		.name = "xilinx_spi",

		.num_resources = ARRAY_SIZE(timberdale_spi_resources),

		.resources = timberdale_spi_resources,

		.platform_data = &timberdale_xspi_platform_data,

		.mfd_data = &timberdale_xspi_platform_data,

	},

	{

		.name = "ks8842",

		.num_resources = ARRAY_SIZE(timberdale_eth_resources),

		.resources = timberdale_eth_resources,

		.platform_data = &timberdale_ks8842_platform_data,

		.mfd_data = &timberdale_ks8842_platform_data,

	},

};
@@ -494,7 +494,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { 
		.name = "timb-dma",

		.num_resources = ARRAY_SIZE(timberdale_dma_resources),

		.resources = timberdale_dma_resources,

		.platform_data = &timb_dma_platform_data,

		.mfd_data = &timb_dma_platform_data,

	},

	{

		.name = "timb-uart",
@@ -505,31 +505,31 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { 
		.name = "xiic-i2c",

		.num_resources = ARRAY_SIZE(timberdale_xiic_resources),

		.resources = timberdale_xiic_resources,

		.platform_data = &timberdale_xiic_platform_data,

		.mfd_data = &timberdale_xiic_platform_data,

	},

	{

		.name = "timb-gpio",

		.num_resources = ARRAY_SIZE(timberdale_gpio_resources),

		.resources = timberdale_gpio_resources,

		.platform_data = &timberdale_gpio_platform_data,

		.mfd_data = &timberdale_gpio_platform_data,

	},

	{

		.name = "timb-video",

		.num_resources = ARRAY_SIZE(timberdale_video_resources),

		.resources = timberdale_video_resources,

		.platform_data = &timberdale_video_platform_data,

		.mfd_data = &timberdale_video_platform_data,

	},

	{

		.name = "timb-radio",

		.num_resources = ARRAY_SIZE(timberdale_radio_resources),

		.resources = timberdale_radio_resources,

		.platform_data = &timberdale_radio_platform_data,

		.mfd_data = &timberdale_radio_platform_data,

	},

	{

		.name = "xilinx_spi",

		.num_resources = ARRAY_SIZE(timberdale_spi_resources),

		.resources = timberdale_spi_resources,

		.platform_data = &timberdale_xspi_platform_data,

		.mfd_data = &timberdale_xspi_platform_data,

	},

};
@@ -538,7 +538,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { 
		.name = "timb-dma",

		.num_resources = ARRAY_SIZE(timberdale_dma_resources),

		.resources = timberdale_dma_resources,

		.platform_data = &timb_dma_platform_data,

		.mfd_data = &timb_dma_platform_data,

	},

	{

		.name = "timb-uart",
@@ -549,37 +549,37 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { 
		.name = "ocores-i2c",

		.num_resources = ARRAY_SIZE(timberdale_ocores_resources),

		.resources = timberdale_ocores_resources,

		.platform_data = &timberdale_ocores_platform_data,

		.mfd_data = &timberdale_ocores_platform_data,

	},

	{

		.name = "timb-gpio",

		.num_resources = ARRAY_SIZE(timberdale_gpio_resources),

		.resources = timberdale_gpio_resources,

		.platform_data = &timberdale_gpio_platform_data,

		.mfd_data = &timberdale_gpio_platform_data,

	},

	{

		.name = "timb-video",

		.num_resources = ARRAY_SIZE(timberdale_video_resources),

		.resources = timberdale_video_resources,

		.platform_data = &timberdale_video_platform_data,

		.mfd_data = &timberdale_video_platform_data,

	},

	{

		.name = "timb-radio",

		.num_resources = ARRAY_SIZE(timberdale_radio_resources),

		.resources = timberdale_radio_resources,

		.platform_data = &timberdale_radio_platform_data,

		.mfd_data = &timberdale_radio_platform_data,

	},

	{

		.name = "xilinx_spi",

		.num_resources = ARRAY_SIZE(timberdale_spi_resources),

		.resources = timberdale_spi_resources,

		.platform_data = &timberdale_xspi_platform_data,

		.mfd_data = &timberdale_xspi_platform_data,

	},

	{

		.name = "ks8842",

		.num_resources = ARRAY_SIZE(timberdale_eth_resources),

		.resources = timberdale_eth_resources,

		.platform_data = &timberdale_ks8842_platform_data,

		.mfd_data = &timberdale_ks8842_platform_data,

	},

};