From patchwork Thu Feb 3 04:11:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andres Salomon X-Patchwork-Id: 5783 Return-path: Envelope-to: mchehab@pedra Delivery-date: Thu, 03 Feb 2011 08:42:35 -0200 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1Pkwe1-0000q3-Tf for mchehab@pedra; Thu, 03 Feb 2011 08:42:34 -0200 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Thu, 03 Feb 2011 08:42:33 -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 1PkqY2-0002KG-NX; Thu, 03 Feb 2011 04:11:59 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755625Ab1BCELi (ORCPT + 1 other); Wed, 2 Feb 2011 23:11:38 -0500 Received: from LUNGE.MIT.EDU ([18.54.1.69]:40959 "EHLO lunge.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755537Ab1BCELi (ORCPT ); Wed, 2 Feb 2011 23:11:38 -0500 Received: from localhost (c-71-231-141-121.hsd1.wa.comcast.net [71.231.141.121]) by lunge.queued.net (Postfix) with ESMTPSA id 7BC863980C5; Wed, 2 Feb 2011 23:11:36 -0500 (EST) Date: Wed, 2 Feb 2011 20:11:33 -0800 From: Andres Salomon To: Samuel Ortiz Cc: linux-kernel@vger.kernel.org, Mark Brown , Matti Aaltonen , Mauro Carvalho Chehab , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , linux-media@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 09/19] wl1273: mfd_cell is now implicitly available to drivers Message-ID: <20110202201133.08dbd07e@queued.net> In-Reply-To: <20110202195417.228e2656@queued.net> References: <20110202195417.228e2656@queued.net> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: 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 --- drivers/media/radio/radio-wl1273.c | 2 +- drivers/mfd/wl1273-core.c | 6 ++---- sound/soc/codecs/wl1273.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c index 7ecc8e6..ebb6eb5 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 = platform_get_drvdata(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..61ec252 100644 --- a/drivers/mfd/wl1273-core.c +++ b/drivers/mfd/wl1273-core.c @@ -79,8 +79,7 @@ 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); + cell->driver_data = &core; children++; if (pdata->children & WL1273_CODEC_CHILD) { @@ -88,8 +87,7 @@ 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); + cell->driver_data = &core; children++; } diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c index 861b28f..0af2c2d 100644 --- a/sound/soc/codecs/wl1273.c +++ b/sound/soc/codecs/wl1273.c @@ -436,7 +436,7 @@ 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 = dev_get_drvdata(codec->dev); struct wl1273_priv *wl1273; int r;