From: dilinger@queued.net (Andres Salomon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/19] ab3100: mfd_cell is now implicitly available to drivers
Date: Wed, 2 Feb 2011 20:03:02 -0800 [thread overview]
Message-ID: <20110202200302.0e05c3d0@queued.net> (raw)
In-Reply-To: <20110202195417.228e2656@queued.net>
No need to explicitly set the cell's platform_data/data_size.
In this case, move the ab3100_platform_data pointer from platform_data
to driver_data. The only client who makes use of it is also changed.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
drivers/mfd/ab3100-core.c | 6 ++----
drivers/regulator/ab3100.c | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 4193af5..244c2a2 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -949,10 +949,8 @@ static int __devinit ab3100_probe(struct i2c_client *client,
goto exit_no_ops;
/* Set up and register the platform devices. */
- for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++) {
- ab3100_devs[i].platform_data = ab3100_plf_data;
- ab3100_devs[i].data_size = sizeof(struct ab3100_platform_data);
- }
+ for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++)
+ ab3100_devs[i].driver_data = ab3100_plf_data;
err = mfd_add_devices(&client->dev, 0, ab3100_devs,
ARRAY_SIZE(ab3100_devs), NULL, 0);
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index ed6feaf..1f266b9 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -576,7 +576,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {
static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
{
- struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
+ struct ab3100_platform_data *plfdata = platform_get_drvdata(pdev);
int err = 0;
u8 data;
int i;
--
1.7.2.3
WARNING: multiple messages have this Message-ID (diff)
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>,
Linus Walleij <linus.walleij@stericsson.com>,
Liam Girdwood <lrg@slimlogic.co.uk>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/19] ab3100: mfd_cell is now implicitly available to drivers
Date: Wed, 2 Feb 2011 20:03:02 -0800 [thread overview]
Message-ID: <20110202200302.0e05c3d0@queued.net> (raw)
In-Reply-To: <20110202195417.228e2656@queued.net>
No need to explicitly set the cell's platform_data/data_size.
In this case, move the ab3100_platform_data pointer from platform_data
to driver_data. The only client who makes use of it is also changed.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
drivers/mfd/ab3100-core.c | 6 ++----
drivers/regulator/ab3100.c | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 4193af5..244c2a2 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -949,10 +949,8 @@ static int __devinit ab3100_probe(struct i2c_client *client,
goto exit_no_ops;
/* Set up and register the platform devices. */
- for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++) {
- ab3100_devs[i].platform_data = ab3100_plf_data;
- ab3100_devs[i].data_size = sizeof(struct ab3100_platform_data);
- }
+ for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++)
+ ab3100_devs[i].driver_data = ab3100_plf_data;
err = mfd_add_devices(&client->dev, 0, ab3100_devs,
ARRAY_SIZE(ab3100_devs), NULL, 0);
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index ed6feaf..1f266b9 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -576,7 +576,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {
static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
{
- struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
+ struct ab3100_platform_data *plfdata = platform_get_drvdata(pdev);
int err = 0;
u8 data;
int i;
--
1.7.2.3
next prev parent reply other threads:[~2011-02-03 4:03 UTC|newest]
Thread overview: 96+ 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 ` [lm-sensors] [PATCH 02/19] jz4740: mfd_cell is now implicitly Andres Salomon
2011-02-03 3:58 ` [PATCH 02/19] jz4740: mfd_cell is now implicitly available to drivers Andres Salomon
2011-02-03 8:09 ` [lm-sensors] [PATCH 02/19] jz4740: mfd_cell is now implicitly Jean Delvare
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-03 4:01 ` Andres Salomon
2011-02-04 8:20 ` Mattias Wallin
2011-02-04 8:20 ` Mattias Wallin
2011-02-03 4:03 ` Andres Salomon [this message]
2011-02-03 4:03 ` [PATCH 04/19] ab3100: " Andres Salomon
2011-02-03 12:52 ` Linus Walleij
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
[not found] ` <20110202195417.228e2656-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>
2011-02-03 4:08 ` [PATCH 07/19] timberdale: " Andres Salomon
2011-02-03 4:08 ` Andres Salomon
2011-03-31 23:05 ` Grant Likely
[not found] ` <20110331230522.GI437-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2011-04-01 11:20 ` Samuel Ortiz
2011-04-01 11:20 ` Samuel Ortiz
2011-04-01 17:47 ` Andres Salomon
2011-04-01 17:47 ` Andres Salomon
2011-04-01 17:56 ` Grant Likely
2011-04-01 17:56 ` Grant Likely
2011-04-01 18:00 ` Grant Likely
[not found] ` <BANLkTi=bCd_+f=EG-O=U5VH_ZNjFhxkziQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-04-01 23:52 ` Samuel Ortiz
2011-04-01 23:52 ` Samuel Ortiz
2011-04-01 23:58 ` Grant Likely
2011-04-01 23:58 ` Grant Likely
[not found] ` <BANLkTi=bq=OGzXFp7qiBr7x_BnGOWf=DRQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-04-02 0:10 ` Andres Salomon
2011-04-02 0:10 ` Andres Salomon
2011-04-04 10:03 ` Samuel Ortiz
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 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 17:51 ` Samuel Ortiz
2011-04-06 18:07 ` Ben Hutchings
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-06 18:38 ` Greg KH
[not found] ` <20110406183854.GA10058-l3A5Bk7waGM@public.gmane.org>
2011-04-07 8:04 ` Grant Likely
2011-04-07 8:04 ` Grant Likely
2011-04-06 18:47 ` Samuel Ortiz
2011-04-06 18:59 ` Felipe Balbi
2011-04-06 18:59 ` Felipe Balbi
[not found] ` <20110406185902.GN25654-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
2011-04-06 22:09 ` Greg KH
2011-04-06 22:09 ` Greg KH
2011-04-07 8:09 ` Felipe Balbi
2011-04-07 13:40 ` Samuel Ortiz
2011-04-07 13:40 ` Samuel Ortiz
2011-04-07 14:35 ` Grant Likely
[not found] ` <20110407143515.GC26452-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2011-04-07 15:03 ` Samuel Ortiz
2011-04-07 15:03 ` Samuel Ortiz
2011-04-07 18:06 ` Grant Likely
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 7:03 ` Andres Salomon
2011-02-03 9:31 ` Mark Brown
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-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-03 4:20 ` Andres Salomon
2011-02-04 9:34 ` Uwe Kleine-König
2011-02-04 9:34 ` Uwe Kleine-König
2011-02-04 10:13 ` Uwe Kleine-König
2011-02-04 10:13 ` Uwe Kleine-König
2011-02-04 10:16 ` Andres Salomon
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=20110202200302.0e05c3d0@queued.net \
--to=dilinger@queued.net \
--cc=linux-arm-kernel@lists.infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.