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: 1413751 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 215873FC85 for ; Thu, 6 Sep 2012 12:14:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754278Ab2IFMMr (ORCPT ); Thu, 6 Sep 2012 08:12:47 -0400 Received: from na3sys009aog126.obsmtp.com ([74.125.149.155]:56630 "EHLO na3sys009aog126.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754139Ab2IFMMl (ORCPT ); Thu, 6 Sep 2012 08:12:41 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]) (using TLSv1) by na3sys009aob126.postini.com ([74.125.148.12]) with SMTP ID DSNKUEiTOSyC0JHsLd4I1ZeOLFUdW4WNN+oi@postini.com; Thu, 06 Sep 2012 05:12:41 PDT Received: by obbuo13 with SMTP id uo13so2297229obb.19 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=Q0AO48bfeHmWnLr7x3VNWp3/8Ky+OpotyfUJz9fPW8okxVINHmR9QMitOecEU6gS9Q 9yTj3afR9tJqhGTrDEbNTaptuanT53F/kf6TI545piUXVUvIrR+R1QhfFCzI1CMfZ8Wr e2r3ffThRPwjUHTnny+hvHZhwGli/ABJwcBxsMUxjZi0XGSywPTd+G+85nffn767O4Wi msNSrjWK3y64gUzpp9Jg9ao5Rcnl+wStuEjJpyhobPM5hXISSw16WieHgYVORR+n9UjK R0XRXrTRF+gPZpaiMG+azGTb8fB0JIuBYvmwCFObO9F76zUipI5dCx2PmyX2j/BAkZDN BNPg== 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 Cc: Tero Kristo , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, Benoit Cousson , linux-kernel@vger.kernel.org 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: ALoCoQl21oapxuU/ycep08+BdjqIpnzykPKWUeYhHj3JcUtFMBKhpO/A4NYw2w5hnp5hVfENByd5 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 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);