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: 1293891 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 AF483DF223 for ; Wed, 8 Aug 2012 09:43:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030283Ab2HHJnX (ORCPT ); Wed, 8 Aug 2012 05:43:23 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:45046 "EHLO na3sys009aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964927Ab2HHJmG (ORCPT ); Wed, 8 Aug 2012 05:42:06 -0400 Received: from mail-ob0-f171.google.com ([209.85.214.171]) (using TLSv1) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKUCI0bc5Bg8s0sJE2sR3EX0mJuQ8q4F7Z@postini.com; Wed, 08 Aug 2012 02:42:06 PDT Received: by obqv19 with SMTP id v19so959936obq.2 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=iYjnsEX6UBHpKzo3uOmWY9AjPKDbmMgq4w3iPFibcfeAdhny0grbKilqcZcuv5Pa+C QP2od4YNC+A0mA/30vt2uqipaNp0K2up9gDwtb9ZbW96Cj3ITD2srDIyplA69XkKFC7C o6biuNgi14LJ/zfJpEyryGM/w4uKbW2Q47uUgZheWrsUuVMDNaGwVmKPDZh8jTgK3zjb dVdh1xlfFWg5q3Ip9idM2tXAoeJhfvkEat4KWXvxSzMJ3257B79r8eDBRgX8SBACM76R WSMW+kCqumeA3IzwWXZoXqBr837DJ7nJ6qQ21ZAfkLsBIHfuUh8d1UT3g1vu+Eql1pFl J4TA== 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 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 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: ALoCoQlwNTWTFoMENdxDOVN8UCaEUAe2tw6T4lSv3A9oEnEb84TJgDLgmrmTvCkHtO3KW/b2R1OX Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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);