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

Commit 6a54ac21 authored by Andres Salomon's avatar Andres Salomon Committed by Samuel Ortiz
Browse files

mfd: mfd_cell is now implicitly available to jz4740 drivers 



No need to explicitly set the cell's platform_data/data_size.

Modify clients to use mfd_get_cell helper function instead of
accessing platform_data directly.

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent fe891a00

drivers/hwmon/jz4740-hwmon.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int __devinit jz4740_hwmon_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	hwmon->cell = pdev->dev.platform_data;

	hwmon->cell = mfd_get_cell(pdev);



	hwmon->irq = platform_get_irq(pdev, 0);

	if (hwmon->irq < 0) {

drivers/mfd/jz4740-adc.c

+0 −4
Original line number Diff line number Diff line
@@ -232,8 +232,6 @@ const struct mfd_cell jz4740_adc_cells[] = { 
		.name = "jz4740-hwmon",

		.num_resources = ARRAY_SIZE(jz4740_hwmon_resources),

		.resources = jz4740_hwmon_resources,

		.platform_data = (void *)&jz4740_adc_cells[0],

		.data_size = sizeof(struct mfd_cell),



		.enable = jz4740_adc_cell_enable,

		.disable = jz4740_adc_cell_disable,
@@ -243,8 +241,6 @@ const struct mfd_cell jz4740_adc_cells[] = { 
		.name = "jz4740-battery",

		.num_resources = ARRAY_SIZE(jz4740_battery_resources),

		.resources = jz4740_battery_resources,

		.platform_data = (void *)&jz4740_adc_cells[1],

		.data_size = sizeof(struct mfd_cell),



		.enable = jz4740_adc_cell_enable,

		.disable = jz4740_adc_cell_disable,

drivers/power/jz4740-battery.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int __devinit jz_battery_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	jz_battery->cell = pdev->dev.platform_data;

	jz_battery->cell = mfd_get_cell(pdev);



	jz_battery->irq = platform_get_irq(pdev, 0);

	if (jz_battery->irq < 0) {