mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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,
	Mauro Carvalho Chehab <mchehab@infradead.org>,
	Liam Girdwood <lrg@slimlogic.co.uk>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>,
	linux-media@vger.kernel.org, alsa-devel@alsa-project.org
Subject: [PATCH 10/29] wl1273: mfd_cell is now implicitly available to drivers
Date: Thu, 17 Feb 2011 19:07:17 -0800	[thread overview]
Message-ID: <1297998456-7615-11-git-send-email-dilinger@queued.net> (raw)
In-Reply-To: <1297998456-7615-1-git-send-email-dilinger@queued.net>

The cell's platform_data is now accessed with a helper function;
change clients to use that, and remove the now-unused data_size.

Signed-off-by: Andres Salomon <dilinger@queued.net>
---
 drivers/media/radio/radio-wl1273.c |    2 +-
 drivers/mfd/wl1273-core.c          |    2 --
 sound/soc/codecs/wl1273.c          |    3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 7ecc8e6..4698eb0 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -2138,7 +2138,7 @@ static int wl1273_fm_radio_remove(struct platform_device *pdev)
 
 static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev)
 {
-	struct wl1273_core **core = pdev->dev.platform_data;
+	struct wl1273_core **core = mfd_get_data(pdev);
 	struct wl1273_device *radio;
 	struct v4l2_ctrl *ctrl;
 	int r = 0;
diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c
index d2ecc24..703085e 100644
--- a/drivers/mfd/wl1273-core.c
+++ b/drivers/mfd/wl1273-core.c
@@ -80,7 +80,6 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
 	cell = &core->cells[children];
 	cell->name = "wl1273_fm_radio";
 	cell->platform_data = &core;
-	cell->data_size = sizeof(core);
 	children++;
 
 	if (pdata->children & WL1273_CODEC_CHILD) {
@@ -89,7 +88,6 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
 		dev_dbg(&client->dev, "%s: Have codec.\n", __func__);
 		cell->name = "wl1273-codec";
 		cell->platform_data = &core;
-		cell->data_size = sizeof(core);
 		children++;
 	}
 
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 861b28f..1ad0d5a 100644
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -436,7 +436,8 @@ EXPORT_SYMBOL_GPL(wl1273_get_format);
 
 static int wl1273_probe(struct snd_soc_codec *codec)
 {
-	struct wl1273_core **core = codec->dev->platform_data;
+	struct wl1273_core **core =
+			mfd_get_data(to_platform_device(codec->dev));
 	struct wl1273_priv *wl1273;
 	int r;
 
-- 
1.7.2.3


  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 ` Andres Salomon [this message]
2011-02-18  3:07 ` [PATCH 11/29] sh_mobile_sdhi: " Andres Salomon
2011-02-18  3:07 ` [PATCH 12/29] tc6393xb: " Andres Salomon
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-11-git-send-email-dilinger@queued.net \
    --to=dilinger@queued.net \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=lrg@slimlogic.co.uk \
    --cc=mchehab@infradead.org \
    --cc=perex@perex.cz \
    --cc=sameo@linux.intel.com \
    --cc=tiwai@suse.de \
    /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