Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757577Ab1EKQ1S (ORCPT ); Wed, 11 May 2011 12:27:18 -0400 Received: from mga01.intel.com ([192.55.52.88]:10747 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757545Ab1EKQ1O (ORCPT ); Wed, 11 May 2011 12:27:14 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.64,351,1301900400"; d="scan'208";a="205351" Date: Wed, 11 May 2011 11:03:19 +0200 From: Samuel Ortiz To: Mark Brown Cc: linux-kernel Subject: [PATCH v1 12/19] mfd: Use mfd cell platform_data for wm8400 cells platform bits Message-ID: <20110511090318.GB2637@sortiz-mobl> References: <1304901131-7104-1-git-send-email-sameo@linux.intel.com> <1304901131-7104-13-git-send-email-sameo@linux.intel.com> <20110509071341.GA21967@opensource.wolfsonmicro.com> <20110510084500.GB17268@sortiz-mobl> <20110510091002.GB5146@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110510091002.GB5146@opensource.wolfsonmicro.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1860 Lines: 56 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: Mark Brown Signed-off-by: Samuel Ortiz --- v0 -> v1: Use dev_get_platdata instead of directly accessing the platform_data pointer. --- drivers/mfd/wm8400-core.c | 3 ++- sound/soc/codecs/wm8400.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c index 3a6e78c..597f82e 100644 --- a/drivers/mfd/wm8400-core.c +++ b/drivers/mfd/wm8400-core.c @@ -245,7 +245,8 @@ static int wm8400_register_codec(struct wm8400 *wm8400) { struct mfd_cell cell = { .name = "wm8400-codec", - .mfd_data = wm8400, + .platform_data = wm8400, + .pdata_size = sizeof(*wm8400), }; return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0); diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 736b785..fbee556 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -1378,7 +1378,7 @@ static void wm8400_probe_deferred(struct work_struct *work) static int wm8400_codec_probe(struct snd_soc_codec *codec) { - struct wm8400 *wm8400 = mfd_get_data(to_platform_device(codec->dev)); + struct wm8400 *wm8400 = dev_get_platdata(codec->dev); struct wm8400_priv *priv; int ret; u16 reg; -- 1.7.2.3 -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/