From patchwork Wed Aug 8 09:41:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1294111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 047D2DF223 for ; Wed, 8 Aug 2012 09:47:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sz2nh-0008Hi-37; Wed, 08 Aug 2012 09:43:37 +0000 Received: from na3sys009aog118.obsmtp.com ([74.125.149.244]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sz2mF-0007TE-EF for linux-arm-kernel@lists.infradead.org; Wed, 08 Aug 2012 09:42:08 +0000 Received: from mail-ob0-f172.google.com ([209.85.214.172]) (using TLSv1) by na3sys009aob118.postini.com ([74.125.148.12]) with SMTP ID DSNKUCI0bc5Bg8s0sJE2sR3EX0mJuQ8q4F7Z@postini.com; Wed, 08 Aug 2012 02:42:07 PDT Received: by obbwc20 with SMTP id wc20so1081974obb.31 for ; Wed, 08 Aug 2012 02:42:05 -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=iyi5pRDRttU6nV5S3X9XDmfst0nYe58JQBG5dqgVkXo=; b=n0w3dHpaAuk9aHJw/sW7h0H0LfQaZOATs8nZqXjDQVylyXVgYOFtYGX3NuoV0CXIeq HibfNYPoWRLy5WbYDVnbmphUE1QcMnOFwJoD0eIzIk/q5JGV/GDyyV4iwXxRc4GcP3oa 3R/iIoT8lSi8qeecVxtRCJMyxxY1ceWpGVbjLBRSI/6t9yWhRwSgL8yiYXqK7plPVeT6 0HHQoXE0JrD82Of8J9zAW+idofbROEoHKDUzWcAYitTzRECotJpckemUD5/KTiQR9E68 EPni7PQJFszAI6LmJUIXkZDrE04EArcVlO1IfRgpbE4H5qw5UGRWI5K6ak0XQLQ1voMG A0MQ== Received: by 10.60.29.161 with SMTP id l1mr29425922oeh.43.1344418925327; Wed, 08 Aug 2012 02:42:05 -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.02 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 02:42:04 -0700 (PDT) From: Peter Ujfalusi To: Samuel Ortiz , Mark Brown , Liam Girdwood , Tony Lindgren , Dmitry Torokhov Subject: [PATCH 08/11] ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data Date: Wed, 8 Aug 2012 12:41:24 +0300 Message-Id: <1344418887-5262-9-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: ALoCoQnrkcYqDL6fA4CfGbXSF44LlyC4c+1fYdujTkL9K+00fKVt4+F0fuJsbg0MAsWljoXOpnE9 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.244 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: alsa-devel@alsa-project.org, Benoit Cousson , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org We no longer have users for the set_hs_extmute callback which has been replaced by hs_extmute_gpio/hs_extmute_disable_level parameters so the codec driver can handle the external mute if it is needed by the board. Signed-off-by: Peter Ujfalusi --- include/linux/i2c/twl.h | 2 -- sound/soc/codecs/twl4030.c | 6 ------ 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 75ce6d1..c9c1fd2 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -666,8 +666,6 @@ struct twl4030_codec_data { unsigned int check_defaults:1; unsigned int reset_registers:1; unsigned int hs_extmute:1; - void (*set_hs_extmute)(int mute); /* Deprecated, use hs_extmute_gpio and - hs_extmute_disable_level */ int hs_extmute_gpio; unsigned int hs_extmute_disable_level:1; /* the GPIO state to disable the extmute */ diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 0630040..1247c4a 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -770,9 +770,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp) if (gpio_is_valid(pdata->hs_extmute_gpio)) { gpio_set_value(pdata->hs_extmute_gpio, !pdata->hs_extmute_disable_level); - } else if (pdata->set_hs_extmute) { - dev_warn(codec->dev, "set_hs_extmute is deprecated\n"); - pdata->set_hs_extmute(1); } else { hs_pop |= TWL4030_EXTMUTE; twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop); @@ -812,9 +809,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp) if (gpio_is_valid(pdata->hs_extmute_gpio)) { gpio_set_value(pdata->hs_extmute_gpio, pdata->hs_extmute_disable_level); - } else if (pdata->set_hs_extmute) { - dev_warn(codec->dev, "set_hs_extmute is deprecated\n"); - pdata->set_hs_extmute(0); } else { hs_pop &= ~TWL4030_EXTMUTE; twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);