From patchwork Fri Feb 18 03:07:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andres Salomon X-Patchwork-Id: 5912 Return-path: Envelope-to: mchehab@pedra Delivery-date: Fri, 18 Feb 2011 10:04:13 -0200 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1PqP4G-000147-Pv for mchehab@pedra; Fri, 18 Feb 2011 10:04:13 -0200 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Fri, 18 Feb 2011 10:04:12 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PqGmF-0001ej-0U; Fri, 18 Feb 2011 03:13:03 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932300Ab1BRDII (ORCPT + 1 other); Thu, 17 Feb 2011 22:08:08 -0500 Received: from LUNGE.MIT.EDU ([18.54.1.69]:51843 "EHLO lunge.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755821Ab1BRDID (ORCPT ); Thu, 17 Feb 2011 22:08:03 -0500 Received: from dev.queued.net (c-71-231-141-121.hsd1.wa.comcast.net [71.231.141.121]) by lunge.queued.net (Postfix) with ESMTPSA id 9A796398290; Thu, 17 Feb 2011 22:08:01 -0500 (EST) From: Andres Salomon To: Samuel Ortiz Cc: Mark Brown , linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , 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 Message-Id: <1297998456-7615-11-git-send-email-dilinger@queued.net> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1297998456-7615-1-git-send-email-dilinger@queued.net> References: <1297998456-7615-1-git-send-email-dilinger@queued.net> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: 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 --- 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;