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>,
Wolfgang Grandegger <wg@grandegger•com>,
socketcan-core@lists•berlios.de, netdev@vger•kernel.org
Subject: [PATCH 14/19] janz: mfd_cell is now implicitly available to drivers
Date: Wed, 2 Feb 2011 20:17:53 -0800 [thread overview]
Message-ID: <20110202201753.73300ea3@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 various platform_data pointers
to driver_data. All of the clients which make use of it
are also changed.
Signed-off-by: Andres Salomon <dilinger@queued•net>
---
drivers/gpio/janz-ttl.c | 2 +-
drivers/mfd/janz-cmodio.c | 3 +--
drivers/net/can/janz-ican3.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/janz-ttl.c b/drivers/gpio/janz-ttl.c
index 813ac07..98a3f9d 100644
--- a/drivers/gpio/janz-ttl.c
+++ b/drivers/gpio/janz-ttl.c
@@ -149,7 +149,7 @@ static int __devinit ttl_probe(struct platform_device *pdev)
struct resource *res;
int ret;
- pdata = pdev->dev.platform_data;
+ pdata = platform_get_drvdata(pdev);
if (!pdata) {
dev_err(dev, "no platform data\n");
ret = -ENXIO;
diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
index 36a166b..77e3a1f 100644
--- a/drivers/mfd/janz-cmodio.c
+++ b/drivers/mfd/janz-cmodio.c
@@ -86,8 +86,7 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv,
/* Add platform data */
pdata->modno = modno;
- cell->platform_data = pdata;
- cell->data_size = sizeof(*pdata);
+ cell->driver_data = pdata;
/* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */
res->flags = IORESOURCE_MEM;
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index b9a6d7a..7d282c3 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1643,7 +1643,7 @@ static int __devinit ican3_probe(struct platform_device *pdev)
struct device *dev;
int ret;
- pdata = pdev->dev.platform_data;
+ pdata = platform_get_drvdata(pdev);
if (!pdata)
return -ENXIO;
--
1.7.2.3
prev parent reply other threads:[~2011-02-03 4:17 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20110202195417.228e2656@queued.net>
[not found] ` <20110202195417.228e2656-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>
2011-02-03 4:08 ` [PATCH 07/19] timberdale: mfd_cell is now implicitly available to drivers 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 17:47 ` Andres Salomon
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:58 ` Grant Likely
[not found] ` <BANLkTi=bq=OGzXFp7qiBr7x_BnGOWf=DRQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
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
[not found] ` <20110406183854.GA10058-l3A5Bk7waGM@public.gmane.org>
2011-04-07 8:04 ` Grant Likely
2011-04-06 18:47 ` Samuel Ortiz
2011-04-06 18:59 ` Felipe Balbi
[not found] ` <20110406185902.GN25654-UiBtZHVXSwEVvW8u9ZQWYwjfymiNCTlR@public.gmane.org>
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
[not found] ` <20110407143515.GC26452-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
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:17 ` Andres Salomon [this message]
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=20110202201753.73300ea3@queued.net \
--to=dilinger@queued$(echo .)net \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sameo@linux$(echo .)intel.com \
--cc=socketcan-core@lists$(echo .)berlios.de \
--cc=wg@grandegger$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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