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
next prev parent reply other threads:[~2011-02-03 4:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20110202195417.228e2656@queued.net>
2011-02-03 4:01 ` [PATCH 03/19] ab3550: mfd_cell is now implicitly available to drivers Andres Salomon
2011-02-04 8:20 ` Mattias Wallin
2011-02-03 4:03 ` Andres Salomon [this message]
2011-02-03 12:52 ` [PATCH 04/19] ab3100: " Linus Walleij
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
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 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).