LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Andres Salomon <dilinger@queued.net>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Jean Delvare <khali@linux-fr.org>,
Guenter Roeck <guenter.roeck@ericsson.com>,
lm-sensors@lm-sensors.org, Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 02/19] jz4740: mfd_cell is now implicitly available to drivers
Date: Wed, 2 Feb 2011 19:58:24 -0800 [thread overview]
Message-ID: <20110202195824.6ebbddff@queued.net> (raw)
In-Reply-To: <20110202195417.228e2656@queued.net>
No need to explicitly set the cell's platform_data/data_size.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
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
next prev parent reply other threads:[~2011-02-03 3:58 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-03 3:54 [RFC] [PATCH 0/19] mfd sharing support Andres Salomon
2011-02-03 3:55 ` [PATCH 01/19] mfd-core: unconditionally add mfd_cell to every platform_device Andres Salomon
2011-02-03 3:58 ` Andres Salomon [this message]
2011-02-03 8:09 ` [PATCH 02/19] jz4740: mfd_cell is now implicitly available to drivers Jean Delvare
2011-02-03 4:01 ` [PATCH 03/19] ab3550: " Andres Salomon
2011-02-04 8:20 ` Mattias Wallin
2011-02-03 4:03 ` [PATCH 04/19] ab3100: " Andres Salomon
2011-02-03 12:52 ` Linus Walleij
2011-02-03 4:04 ` [PATCH 05/19] asic3: " Andres Salomon
2011-02-03 4:05 ` [PATCH 06/19] htc-pasic3: " Andres Salomon
2011-02-03 4:08 ` [PATCH 07/19] timberdale: " Andres Salomon
2011-03-31 23:05 ` Grant Likely
2011-04-01 11:20 ` Samuel Ortiz
2011-04-01 17:47 ` Andres Salomon
2011-04-01 17:56 ` Grant Likely
2011-04-01 18:00 ` Grant Likely
2011-04-01 23:52 ` Samuel Ortiz
2011-04-01 23:58 ` Grant Likely
2011-04-02 0:10 ` Andres Salomon
2011-04-04 10:03 ` Samuel Ortiz
2011-04-05 3:04 ` Grant Likely
2011-04-06 15:23 ` Samuel Ortiz
2011-04-06 15:58 ` Greg KH
2011-04-06 17:05 ` Samuel Ortiz
2011-04-06 17:16 ` Ben Hutchings
2011-04-06 17:51 ` Samuel Ortiz
2011-04-06 18:07 ` Ben Hutchings
2011-04-06 17:56 ` Greg KH
2011-04-06 18:25 ` Andres Salomon
2011-04-06 18:38 ` Greg KH
2011-04-07 8:04 ` Grant Likely
2011-04-06 18:47 ` Samuel Ortiz
2011-04-06 18:59 ` Felipe Balbi
2011-04-06 22:09 ` Greg KH
2011-04-07 8:09 ` Felipe Balbi
2011-04-07 13:40 ` Samuel Ortiz
2011-04-07 14:35 ` Grant Likely
2011-04-07 15:03 ` Samuel Ortiz
2011-04-07 18:06 ` Grant Likely
2011-04-07 16:24 ` Grant Likely
2011-04-01 18:26 ` Samuel Ortiz
2011-02-03 4:09 ` [PATCH 08/19] t7166xb: " Andres Salomon
2011-02-03 4:11 ` [PATCH 09/19] wl1273: " Andres Salomon
2011-02-03 4:12 ` [PATCH 10/19] sh_mobile_sdhi: " Andres Salomon
2011-02-03 4:13 ` [PATCH 11/19] tc6393xb: " Andres Salomon
2011-02-03 4:15 ` [PATCH 12/19] twl4030: " Andres Salomon
2011-02-03 6:05 ` Dmitry Torokhov
2011-02-03 6:39 ` Andres Salomon
2011-02-03 6:53 ` Dmitry Torokhov
2011-02-03 7:03 ` Andres Salomon
2011-02-03 9:31 ` Mark Brown
2011-02-05 2:39 ` Andres Salomon
2011-02-05 3:25 ` Andres Salomon
2011-02-03 12:23 ` Peter Ujfalusi
2011-02-04 10:41 ` Uwe Kleine-König
2011-02-03 4:16 ` [PATCH 13/19] tc6387xb: " Andres Salomon
2011-02-03 4:17 ` [PATCH 14/19] janz: " Andres Salomon
2011-02-03 4:20 ` [PATCH 15/19] mc13xxx: " Andres Salomon
2011-02-04 9:34 ` Uwe Kleine-König
2011-02-04 10:13 ` Uwe Kleine-König
2011-02-04 10:16 ` Andres Salomon
2011-02-03 4:21 ` [PATCH 16/19] mfd-core: drop platform_data/data_size from core mfd_cell struct Andres Salomon
2011-02-03 4:22 ` [PATCH 17/19] mfd-core: add refcounting support to mfd_cells Andres Salomon
2011-02-03 4:23 ` [PATCH 18/19] mfd-core: add platform_device sharing support for mfd Andres Salomon
2011-02-03 4:26 ` [PATCH 19/19] cs5535-mfd: add sharing for acpi/pms cells Andres Salomon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110202195824.6ebbddff@queued.net \
--to=dilinger@queued.net \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=guenter.roeck@ericsson.com \
--cc=khali@linux-fr.org \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).