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: Andres Salomon <dilinger@queued.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c
index 1c8b3d9e205186c4018fc040eeffd305513f725f..40f106d95afeb582b7dc494634486d52e13168f0 100644 (file)
--- a/drivers/hwmon/jz4740-hwmon.c
+++ b/drivers/hwmon/jz4740-hwmon.c
@@ -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) {

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 0cc59795f6004df02380608d28f300f85e07435a..aa518b9beaf5c4e7ebb9059ddbd8f62d55916c84 100644 (file)
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -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,

diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index 02414db6a94c151208bab6ff51917765cc074db1..0938650a466c3d387e35e1edae3cdbffcfe1b47b 100644 (file)
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -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) {