Skip to contentSkip to conversation

jz4740: mfd_cell is now implicitly available to drivers

PATCH In review Andres Salomon 2 participants 3 messages Feb 12, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/17 jz4740: mfd_cell is now implicitly available to 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.

---
 drivers/hwmon/jz4740-hwmon.c   |    2 +-
 drivers/mfd/jz4740-adc.c       |    4 ----
 drivers/power/jz4740-battery.c |    2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)
drivers/hwmon/jz4740-hwmon.c +1 -1
index 1c8b3d9..40f106d 100644
@@ -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
index 0cc5979..aa518b9 100644
@@ -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
index 02414db..0938650 100644
@@ -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) {
Signature · 7 lines
1.7.2.3


_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#1 lore raw
Quoted 7 lines · Andres Salomon

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.

I don't see anything different to the previous version of this patch (which was Acked by Jean already), and there is no changelog available for the complete series either.

A changelog would be really helpful.

Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#2 lore raw
Quoted 4 lines · On Fri, 11 Feb 2011 19:51:38 -0800 Guenter Roeck <[email protected]>…
Quoted 3 lines · Andres Salomon

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

Quoted 8 lines
Quoted 4 lines

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

I don't see anything different to the previous version of this patch (which was Acked by Jean already), and there is no changelog available for the complete series either.

It is exactly the same; sorry, I should've added Jean's ACK.

For patches where there was a difference, I tried to have the patch description be more.. descriptive.

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors