From patchwork Wed Aug 8 09:41:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1293761 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 8F1B5DF223 for ; Wed, 8 Aug 2012 09:42:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030319Ab2HHJmR (ORCPT ); Wed, 8 Aug 2012 05:42:17 -0400 Received: from na3sys009aog113.obsmtp.com ([74.125.149.209]:33285 "EHLO na3sys009aog113.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030307Ab2HHJmN (ORCPT ); Wed, 8 Aug 2012 05:42:13 -0400 Received: from mail-ob0-f180.google.com ([209.85.214.180]) (using TLSv1) by na3sys009aob113.postini.com ([74.125.148.12]) with SMTP ID DSNKUCI0dKK0m6/rK87WaxqifKsVwTcusbfl@postini.com; Wed, 08 Aug 2012 02:42:13 PDT Received: by obbuo19 with SMTP id uo19so837329obb.11 for ; Wed, 08 Aug 2012 02:42:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=l5yllrFmi/bNfrpqaecEpmV1zePWsB0k02uP0+nCjyc=; b=kmNULQRTpoeP2ZHIkYScUPeP3iBUmCl1Q1VA3miE/pTyeHrARydcaQG/GsXtdijeKN 2vlYo8JQZtZ+2RVsnKX31rgVOCgl1cNsV+7dRjW9QPIpQ89dzruSpSw/Uj6PzbhW09+x rX3lO+s+OqEeHrD02S9Fg38dKOSolr1CdUWcDgYjbfrOFcWkNpvG6b1nYw4puAlUqkCX rCOXGTNc0VFeI+1O/EYV3piO/f9XCtDl/qRBVvFS6Aq4OLvaTpMnLIhvwtZJelWlSfG/ gxf8LJpP1Dvz8zc4+TU0LrDf+u+hnxM0NUDP/WsY1IttvtyhU74QMgRm0zfLkz31K0PL Mrxw== Received: by 10.182.116.2 with SMTP id js2mr29490559obb.38.1344418932233; Wed, 08 Aug 2012 02:42:12 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id c6sm22141308obn.13.2012.08.08.02.42.09 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 02:42:11 -0700 (PDT) From: Peter Ujfalusi To: Samuel Ortiz , Mark Brown , Liam Girdwood , Tony Lindgren , Dmitry Torokhov Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Benoit Cousson Subject: [PATCH 10/11] ASoC: twl4030: Add pointer to pdata within the private data Date: Wed, 8 Aug 2012 12:41:26 +0300 Message-Id: <1344418887-5262-11-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> References: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQlR6EKwB1i4uE5Wr/gp4bseY/J8krim5pfB0VIoJug4UGyCUShtzfYO+Y89QFIhGCmx2IpT Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Access the pdata via a pointer within the twl4030_priv structure. In preparation for DeviceTree support. Signed-off-by: Peter Ujfalusi --- sound/soc/codecs/twl4030.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 6a00c01..bf0240d 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -153,8 +153,7 @@ struct twl4030_priv { u8 predrivel_enabled, predriver_enabled; u8 carkitl_enabled, carkitr_enabled; - /* Delay needed after enabling the digimic interface */ - unsigned int digimic_delay; + struct twl4030_codec_data *pdata; }; /* @@ -350,7 +349,7 @@ static void twl4030_init_chip(struct snd_soc_codec *codec) if (!pdata) return; - twl4030->digimic_delay = pdata->digimic_delay; + twl4030->pdata = pdata; reg = twl4030_read_reg_cache(codec, TWL4030_REG_HS_POPN_SET); reg &= ~TWL4030_RAMP_DELAY; @@ -751,9 +750,9 @@ static int aif_event(struct snd_soc_dapm_widget *w, static void headset_ramp(struct snd_soc_codec *codec, int ramp) { - struct twl4030_codec_data *pdata = codec->dev->platform_data; unsigned char hs_gain, hs_pop; struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); + struct twl4030_codec_data *pdata = twl4030->pdata; /* Base values for ramp delay calculation: 2^19 - 2^26 */ unsigned int ramp_base[] = {524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864}; @@ -868,9 +867,10 @@ static int digimic_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec); + struct twl4030_codec_data *pdata = twl4030->pdata; - if (twl4030->digimic_delay) - twl4030_wait_ms(twl4030->digimic_delay); + if (pdata && pdata->digimic_delay) + twl4030_wait_ms(pdata->digimic_delay); return 0; } @@ -2252,8 +2252,8 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec) static int twl4030_soc_remove(struct snd_soc_codec *codec) { - struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev); struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); + struct twl4030_codec_data *pdata = twl4030->pdata; /* Reset registers to their chip default before leaving */ twl4030_reset_registers(codec);