2011-02-12 02:02:55

by Andres Salomon

Subject: [PATCH 03/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.

Signed-off-by: Andres Salomon <[email protected]>
---
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(-)

diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c
index 1c8b3d9..40f106d 100644
--- 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 0cc5979..aa518b9 100644
--- 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 02414db..0938650 100644
--- 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) {
--
1.7.2.3

2011-02-12 03:52:29

by Guenter Roeck

Subject: Re: [PATCH 03/17] jz4740: mfd_cell is now implicitly available to drivers

On Fri, Feb 11, 2011 at 09:02:50PM -0500, Andres Salomon wrote:
>
> 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 <[email protected]>

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

2011-02-12 08:16:27

by Andres Salomon

Subject: Re: [PATCH 03/17] jz4740: mfd_cell is now implicitly available to drivers

On Fri, 11 Feb 2011 19:51:38 -0800
Guenter Roeck <[email protected]> wrote:

> On Fri, Feb 11, 2011 at 09:02:50PM -0500, Andres Salomon wrote:
> >
> > 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 <[email protected]>
>
> 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.