From: Andres Salomon <dilinger@queued.net>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
linux-kernel@vger.kernel.org,
David Brownell <dbrownell@users.sourceforge.net>,
Greg Kroah-Hartman <gregkh@suse.de>,
linux-usb@vger.kernel.org, linux-fbdev@vger.kernel.org
Subject: [PATCH 12/29] tc6393xb: mfd_cell is now implicitly available to drivers
Date: Thu, 17 Feb 2011 19:07:19 -0800 [thread overview]
Message-ID: <1297998456-7615-13-git-send-email-dilinger@queued.net> (raw)
In-Reply-To: <1297998456-7615-1-git-send-email-dilinger@queued.net>
No need to explicitly set the cell's platform_data/data_size.
Modify clients to use mfd_get_cell helper function instead of
accessing platform_data directly.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
drivers/mfd/tc6393xb.c | 19 -------------------
drivers/usb/host/ohci-tmio.c | 8 ++++----
drivers/video/tmiofb.c | 20 +++++++++-----------
3 files changed, 13 insertions(+), 34 deletions(-)
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 9a23863..a71ff5c 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -694,26 +694,7 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)
}
tc6393xb_cells[TC6393XB_CELL_NAND].driver_data = tcpd->nand_data;
- tc6393xb_cells[TC6393XB_CELL_NAND].platform_data =
- &tc6393xb_cells[TC6393XB_CELL_NAND];
- tc6393xb_cells[TC6393XB_CELL_NAND].data_size =
- sizeof(tc6393xb_cells[TC6393XB_CELL_NAND]);
-
- tc6393xb_cells[TC6393XB_CELL_MMC].platform_data =
- &tc6393xb_cells[TC6393XB_CELL_MMC];
- tc6393xb_cells[TC6393XB_CELL_MMC].data_size =
- sizeof(tc6393xb_cells[TC6393XB_CELL_MMC]);
-
- tc6393xb_cells[TC6393XB_CELL_OHCI].platform_data =
- &tc6393xb_cells[TC6393XB_CELL_OHCI];
- tc6393xb_cells[TC6393XB_CELL_OHCI].data_size =
- sizeof(tc6393xb_cells[TC6393XB_CELL_OHCI]);
-
tc6393xb_cells[TC6393XB_CELL_FB].driver_data = tcpd->fb_data;
- tc6393xb_cells[TC6393XB_CELL_FB].platform_data =
- &tc6393xb_cells[TC6393XB_CELL_FB];
- tc6393xb_cells[TC6393XB_CELL_FB].data_size =
- sizeof(tc6393xb_cells[TC6393XB_CELL_FB]);
ret = mfd_add_devices(&dev->dev, dev->id,
tc6393xb_cells, ARRAY_SIZE(tc6393xb_cells),
diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
index 8dabe8e..eeed164 100644
--- a/drivers/usb/host/ohci-tmio.c
+++ b/drivers/usb/host/ohci-tmio.c
@@ -185,7 +185,7 @@ static struct platform_driver ohci_hcd_tmio_driver;
static int __devinit ohci_hcd_tmio_drv_probe(struct platform_device *dev)
{
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
struct resource *regs = platform_get_resource(dev, IORESOURCE_MEM, 0);
struct resource *config = platform_get_resource(dev, IORESOURCE_MEM, 1);
struct resource *sram = platform_get_resource(dev, IORESOURCE_MEM, 2);
@@ -274,7 +274,7 @@ static int __devexit ohci_hcd_tmio_drv_remove(struct platform_device *dev)
{
struct usb_hcd *hcd = platform_get_drvdata(dev);
struct tmio_hcd *tmio = hcd_to_tmio(hcd);
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
usb_remove_hcd(hcd);
tmio_stop_hc(dev);
@@ -293,7 +293,7 @@ static int __devexit ohci_hcd_tmio_drv_remove(struct platform_device *dev)
#ifdef CONFIG_PM
static int ohci_hcd_tmio_drv_suspend(struct platform_device *dev, pm_message_t state)
{
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
struct usb_hcd *hcd = platform_get_drvdata(dev);
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
struct tmio_hcd *tmio = hcd_to_tmio(hcd);
@@ -326,7 +326,7 @@ static int ohci_hcd_tmio_drv_suspend(struct platform_device *dev, pm_message_t s
static int ohci_hcd_tmio_drv_resume(struct platform_device *dev)
{
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
struct usb_hcd *hcd = platform_get_drvdata(dev);
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
struct tmio_hcd *tmio = hcd_to_tmio(hcd);
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index dfef88c..6302882 100644
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -250,7 +250,7 @@ static irqreturn_t tmiofb_irq(int irq, void *__info)
*/
static int tmiofb_hw_stop(struct platform_device *dev)
{
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
struct tmio_fb_data *data = cell->driver_data;
struct fb_info *info = platform_get_drvdata(dev);
struct tmiofb_par *par = info->par;
@@ -268,7 +268,7 @@ static int tmiofb_hw_stop(struct platform_device *dev)
*/
static int tmiofb_hw_init(struct platform_device *dev)
{
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
struct fb_info *info = platform_get_drvdata(dev);
struct tmiofb_par *par = info->par;
const struct resource *nlcr = &cell->resources[0];
@@ -312,7 +312,7 @@ static int tmiofb_hw_init(struct platform_device *dev)
*/
static void tmiofb_hw_mode(struct platform_device *dev)
{
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
struct tmio_fb_data *data = cell->driver_data;
struct fb_info *info = platform_get_drvdata(dev);
struct fb_videomode *mode = info->mode;
@@ -559,8 +559,7 @@ static int tmiofb_ioctl(struct fb_info *fbi,
static struct fb_videomode *
tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var)
{
- struct mfd_cell *cell =
- info->device->platform_data;
+ struct mfd_cell *cell = mfd_get_cell(to_platform_device(info->device));
struct tmio_fb_data *data = cell->driver_data;
struct fb_videomode *best = NULL;
int i;
@@ -581,8 +580,7 @@ static int tmiofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
{
struct fb_videomode *mode;
- struct mfd_cell *cell =
- info->device->platform_data;
+ struct mfd_cell *cell = mfd_get_cell(to_platform_device(info->device));
struct tmio_fb_data *data = cell->driver_data;
mode = tmiofb_find_mode(info, var);
@@ -683,7 +681,7 @@ static struct fb_ops tmiofb_ops = {
static int __devinit tmiofb_probe(struct platform_device *dev)
{
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
struct tmio_fb_data *data = cell->driver_data;
struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);
struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);
@@ -811,7 +809,7 @@ err_ioremap_ccr:
static int __devexit tmiofb_remove(struct platform_device *dev)
{
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
struct fb_info *info = platform_get_drvdata(dev);
int irq = platform_get_irq(dev, 0);
struct tmiofb_par *par;
@@ -941,7 +939,7 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
#ifdef CONFIG_FB_TMIO_ACCELL
struct tmiofb_par *par = info->par;
#endif
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
int retval = 0;
console_lock();
@@ -973,7 +971,7 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
static int tmiofb_resume(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
- struct mfd_cell *cell = dev->dev.platform_data;
+ struct mfd_cell *cell = mfd_get_cell(dev);
int retval = 0;
console_lock();
--
1.7.2.3
next prev parent reply other threads:[~2011-02-18 3:08 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-18 3:07 MFD sharing support (v3, full) Andres Salomon
2011-02-18 3:07 ` [PATCH 01/29] mfd-core: fix up typos/vagueness in comment Andres Salomon
2011-02-18 3:07 ` [PATCH 02/29] mfd-core: unconditionally add mfd_cell to every platform_device Andres Salomon
2011-02-18 3:07 ` [PATCH 03/29] jz4740: mfd_cell is now implicitly available to drivers Andres Salomon
2011-02-18 3:07 ` [PATCH 04/29] ab3550: " Andres Salomon
2011-02-18 3:07 ` [PATCH 05/29] ab3100: mfd_cell is now implicitly available to drivers (v2) Andres Salomon
2011-02-18 3:07 ` [PATCH 06/29] asic3: mfd_cell is now implicitly available to drivers Andres Salomon
2011-02-18 3:07 ` [PATCH 07/29] htc-pasic3: " Andres Salomon
2011-02-18 3:07 ` [PATCH 08/29] timberdale: mfd_cell is now implicitly available to drivers (v2) Andres Salomon
2011-02-18 3:07 ` [PATCH 09/29] t7166xb: mfd_cell is now implicitly available to drivers Andres Salomon
2011-02-25 9:05 ` Artem Bityutskiy
2011-02-25 10:47 ` Samuel Ortiz
2011-02-18 3:07 ` [PATCH 10/29] wl1273: " Andres Salomon
2011-02-18 3:07 ` [PATCH 11/29] sh_mobile_sdhi: " Andres Salomon
2011-02-18 3:07 ` Andres Salomon [this message]
2011-02-18 3:07 ` [PATCH 13/29] twl4030: mfd_cell is now implicitly available to drivers (v2) Andres Salomon
2011-02-18 6:44 ` Peter Ujfalusi
2011-02-18 3:07 ` [PATCH 14/29] tc6387xb: mfd_cell is now implicitly available to drivers Andres Salomon
2011-02-18 3:07 ` [PATCH 15/29] janz: mfd_cell is now implicitly available to drivers (v2) Andres Salomon
2011-02-18 3:07 ` [PATCH 16/29] mc13xxx: " Andres Salomon
2011-02-18 3:07 ` [PATCH 17/29] mfd-core: drop data_size from mfd_cell struct Andres Salomon
2011-02-18 3:07 ` [PATCH 18/29] mfd-core: rename platform_data field of mfd_cell to mfd_data Andres Salomon
2011-02-18 3:07 ` [PATCH 19/29] davinci_voicecodec: use mfd_data instead of driver_data Andres Salomon
2011-02-18 3:07 ` [PATCH 20/29] wm8400-codec: use mfd_data instead of driver_data (v2) Andres Salomon
2011-02-18 3:51 ` Mark Brown
2011-02-18 3:07 ` [PATCH 21/29] ds1wm: use mfd_data instead of driver_data Andres Salomon
2011-02-18 3:07 ` [PATCH 22/29] tmio-mmc: " Andres Salomon
2011-02-18 3:07 ` [PATCH 23/29] tmio-nand: " Andres Salomon
2011-02-18 3:07 ` [PATCH 24/29] tmio-fb: " Andres Salomon
2011-02-18 3:07 ` [PATCH 25/29] rdc321x-southbridge: use mfd_data instead of driver_data (v2) Andres Salomon
2011-02-18 3:07 ` [PATCH 26/29] mfd-core: remove driver_data field from mfd_cell Andres Salomon
2011-02-18 3:07 ` [PATCH 27/29] mfd-core: add refcounting support to mfd_cells (v2) Andres Salomon
2011-02-28 16:39 ` Samuel Ortiz
2011-02-18 3:07 ` [PATCH 28/29] mfd-core: add platform_device sharing support for mfd (v2) Andres Salomon
2011-02-28 16:40 ` Samuel Ortiz
2011-02-18 3:07 ` [PATCH 29/29] cs5535-mfd: add sharing for acpi/pms cells Andres Salomon
2011-02-28 16:39 ` MFD sharing support (v3, full) Samuel Ortiz
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=1297998456-7615-13-git-send-email-dilinger@queued.net \
--to=dilinger@queued.net \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dbrownell@users.sourceforge.net \
--cc=gregkh@suse.de \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.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
Powered by JetHome