From patchwork Thu Sep 6 12:12:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1413981 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 537F43FC85 for ; Thu, 6 Sep 2012 12:18:50 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9ayk-0002Gl-Df; Thu, 06 Sep 2012 12:14:39 +0000 Received: from na3sys009aog134.obsmtp.com ([74.125.149.83]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9aws-0001Cq-ES for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 12:12:43 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) (using TLSv1) by na3sys009aob134.postini.com ([74.125.148.12]) with SMTP ID DSNKUEiTOSyC0JHsLd4I1ZeOLFUdW4WNN+oi@postini.com; Thu, 06 Sep 2012 05:12:42 PDT Received: by obbta17 with SMTP id ta17so2325478obb.36 for ; Thu, 06 Sep 2012 05:12:40 -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=1iNqDUAM2l99hiiRe0i1GgyngO8vyLBImIYtQp5UHb0=; b=R/86mALMAnSq63elMpC/eznxRtPcnM6J1swBRgdelWkqlJNvby2d6Aflzl3/XXZXqz bcTtlO9IXq3nE90YzXv0u695DsBg2o+APaQqjeaq20XJJILJY3NUW0LXR2puOpeZhuSO cYN/0aRE9cvoJJ2oWwiQBnfkEdPQF8HGuoCXkqjMsg69QKMaF3vJDSDCiiwdTgFGA8l3 1HnRxEoJTWB9ygyo4B5mkVQBvx3ynwtbqm89O7VHOCc4mEXEsJi5bDJMyEZhQTXJO0Sm o7nlMprUhgkAGDwh8xEiZ+GhxenyEu2ukF1YJH0wXRcer4jQaikxCwEK8E7NoYpjoapZ /cNg== Received: by 10.182.76.164 with SMTP id l4mr1691203obw.65.1346933560538; Thu, 06 Sep 2012 05:12:40 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id zn9sm1795856obb.23.2012.09.06.05.12.37 (version=SSLv3 cipher=OTHER); Thu, 06 Sep 2012 05:12:40 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren , Samuel Ortiz , Dmitry Torokhov , Grant Likely , Rob Herring Subject: [PATCH v3 11/14] ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data Date: Thu, 6 Sep 2012 15:12:18 +0300 Message-Id: <1346933541-21547-12-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1346933541-21547-1-git-send-email-peter.ujfalusi@ti.com> References: <1346933541-21547-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQnvMSJ5nIJvYh+5rn9e06hH9nr59VqaqjL729YJedRb5pKBZJWdRW0pEEGTTDdscUa/bIYX 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.83 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, Tero Kristo , 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 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, 8 deletions(-) diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 2040309..a4885a6 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -667,8 +667,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; }; diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 5fc271a..27ccea4 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -767,9 +767,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp) if (pdata && pdata->hs_extmute) { if (gpio_is_valid(pdata->hs_extmute_gpio)) { gpio_set_value(pdata->hs_extmute_gpio, 1); - } 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); @@ -808,9 +805,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp) if (pdata && pdata->hs_extmute) { if (gpio_is_valid(pdata->hs_extmute_gpio)) { gpio_set_value(pdata->hs_extmute_gpio, 0); - } 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);