Skip to content

Commit

Permalink
mfd: mfd_cell is now implicitly available to jz4740 drivers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andres Salomon authored and Samuel Ortiz committed Mar 23, 2011
1 parent fe891a0 commit 6a54ac2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/hwmon/jz4740-hwmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 0 additions & 4 deletions drivers/mfd/jz4740-adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/jz4740-battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 6a54ac2

Please sign in to comment.