From: Samuel Ortiz <sameo@linux.intel.com>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
Grant Likely <grant.likely@secretlab.ca>,
Wim Van Sebroeck <wim@iguana.be>,
Florian Fainelli <florian@openwrt.org>
Subject: [PATCH 11/19] mfd: Use mfd cell platform_data for rdc321x cells platform bits
Date: Mon, 9 May 2011 02:32:03 +0200 [thread overview]
Message-ID: <1304901131-7104-12-git-send-email-sameo@linux.intel.com> (raw)
In-Reply-To: <1304901131-7104-1-git-send-email-sameo@linux.intel.com>
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---
drivers/gpio/rdc321x-gpio.c | 3 +--
drivers/mfd/rdc321x-southbridge.c | 6 ++++--
drivers/watchdog/rdc321x_wdt.c | 3 +--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c
index a9bda88..2762698 100644
--- a/drivers/gpio/rdc321x-gpio.c
+++ b/drivers/gpio/rdc321x-gpio.c
@@ -27,7 +27,6 @@
#include <linux/pci.h>
#include <linux/gpio.h>
#include <linux/mfd/rdc321x.h>
-#include <linux/mfd/core.h>
#include <linux/slab.h>
struct rdc321x_gpio {
@@ -136,7 +135,7 @@ static int __devinit rdc321x_gpio_probe(struct platform_device *pdev)
struct rdc321x_gpio *rdc321x_gpio_dev;
struct rdc321x_gpio_pdata *pdata;
- pdata = mfd_get_data(pdev);
+ pdata = pdev->dev.platform_data;
if (!pdata) {
dev_err(&pdev->dev, "no platform data supplied\n");
return -ENODEV;
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index 10dbe63..809bd4a 100644
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
@@ -61,12 +61,14 @@ static struct mfd_cell rdc321x_sb_cells[] = {
.name = "rdc321x-wdt",
.resources = rdc321x_wdt_resource,
.num_resources = ARRAY_SIZE(rdc321x_wdt_resource),
- .mfd_data = &rdc321x_wdt_pdata,
+ .platform_data = &rdc321x_wdt_pdata,
+ .pdata_size = sizeof(rdc321x_wdt_pdata),
}, {
.name = "rdc321x-gpio",
.resources = rdc321x_gpio_resources,
.num_resources = ARRAY_SIZE(rdc321x_gpio_resources),
- .mfd_data = &rdc321x_gpio_pdata,
+ .platform_data = &rdc321x_gpio_pdata,
+ .pdata_size = sizeof(rdc321x_gpio_pdata),
},
};
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index d8e7250..428f8a1 100644
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -37,7 +37,6 @@
#include <linux/io.h>
#include <linux/uaccess.h>
#include <linux/mfd/rdc321x.h>
-#include <linux/mfd/core.h>
#define RDC_WDT_MASK 0x80000000 /* Mask */
#define RDC_WDT_EN 0x00800000 /* Enable bit */
@@ -232,7 +231,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
struct resource *r;
struct rdc321x_wdt_pdata *pdata;
- pdata = mfd_get_data(pdev);
+ pdata = pdev->dev.platform_data;
if (!pdata) {
dev_err(&pdev->dev, "no platform data supplied\n");
return -ENODEV;
--
1.7.2.3
next prev parent reply other threads:[~2011-05-09 0:33 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1304901131-7104-1-git-send-email-sameo@linux.intel.com>
2011-05-09 0:31 ` [PATCH 02/19] mfd: Use mfd cell platform_data for ab3550 cells platform bits Samuel Ortiz
2011-05-09 7:01 ` Linus Walleij
2011-05-09 0:31 ` [PATCH 03/19] mfd: Use mfd cell platform_data for ab3100 " Samuel Ortiz
2011-05-09 7:02 ` Linus Walleij
2011-05-09 0:31 ` [PATCH 04/19] mmc: Use device platform_data to retrieve tmio_mmc " Samuel Ortiz
2011-05-09 0:31 ` [PATCH 05/19] w1: Use device platform_data to retrieve ds1wm " Samuel Ortiz
2011-05-09 0:31 ` [PATCH 06/19] mfd: Pass htc-pasic3 led platform data through the cell platform_data Samuel Ortiz
2011-05-09 10:20 ` Paul Parsons
2011-05-09 11:25 ` Samuel Ortiz
2011-05-09 0:31 ` [PATCH 07/19] mfd: Use mfd cell platform_data for wl1273 cells platform bits Samuel Ortiz
2011-06-09 8:43 ` Matti J. Aaltonen
2011-05-09 0:32 ` [PATCH 08/19] fb: Use platform_data to retrieve tmiofb " Samuel Ortiz
2011-05-09 0:32 ` [PATCH 09/19] mtd: Use platform_data to retrieve tmio_nand " Samuel Ortiz
2011-05-09 0:32 ` [PATCH 10/19] mfd: Use mfd cell platform_data for timberdale cells " Samuel Ortiz
2011-05-09 0:32 ` Samuel Ortiz [this message]
2011-05-09 0:32 ` [PATCH 12/19] mfd: Use mfd cell platform_data for wm8400 " Samuel Ortiz
2011-05-09 7:13 ` Mark Brown
2011-05-10 8:45 ` Samuel Ortiz
2011-05-10 9:10 ` Mark Brown
2011-05-11 9:03 ` [PATCH v1 " Samuel Ortiz
2011-05-11 9:20 ` Mark Brown
2011-05-09 0:32 ` [PATCH 13/19] mfd: Use mfd cell platform_data for mc13xxx " Samuel Ortiz
2011-05-09 0:32 ` [PATCH 14/19] mfd: Use mfd cell platform_data for janz " Samuel Ortiz
2011-05-09 0:32 ` [PATCH 15/19] mfd: Use mfd cell platform_data for twl4030 codec " Samuel Ortiz
2011-05-09 0:32 ` [PATCH 16/19] mfd: Use mfd cell platform_data for tps6105x " Samuel Ortiz
2011-05-09 7:05 ` Linus Walleij
2011-05-11 8:23 ` Samuel Ortiz
2011-05-11 19:41 ` Linus Walleij
2011-05-11 9:05 ` [PATCH v1 " Samuel Ortiz
2011-05-09 0:32 ` [PATCH 17/19] mfd: Use mfd cell platform_data for 88pm860x " Samuel Ortiz
2011-05-09 8:21 ` Haojian Zhuang
2011-05-09 0:32 ` [PATCH 18/19] mfd: Use mfd cell platform_data for davinci " Samuel Ortiz
[not found] ` <1304901131-7104-2-git-send-email-sameo@linux.intel.com>
2011-05-09 8:22 ` [PATCH 01/19] mfd: Add platform data pointer back Haojian Zhuang
2011-05-09 11:21 ` Samuel Ortiz
[not found] ` <1304901131-7104-20-git-send-email-sameo@linux.intel.com>
2011-05-09 8:22 ` [PATCH 19/19] mfd: Remove mfd_data Haojian Zhuang
2011-05-09 11:20 ` [PATCH 00/19] mfd: mfd_data removal Samuel Ortiz
2011-05-10 7:52 ` Richard Röjfors
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=1304901131-7104-12-git-send-email-sameo@linux.intel.com \
--to=sameo@linux.intel.com \
--cc=florian@openwrt.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=wim@iguana.be \
/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