From patchwork Sun May 3 17:27:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 6321261 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C3AAC9F1C2 for ; Sun, 3 May 2015 17:28:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E89A7203AF for ; Sun, 3 May 2015 17:28:13 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 0E99E203AC for ; Sun, 3 May 2015 17:28:13 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id DEE572605F2; Sun, 3 May 2015 19:28:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 8DBF926050C; Sun, 3 May 2015 19:27:31 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6772626050C; Sun, 3 May 2015 19:27:27 +0200 (CEST) Received: from smtp-out-153.synserver.de (smtp-out-155.synserver.de [212.40.185.155]) by alsa0.perex.cz (Postfix) with ESMTP id 204D426049B for ; Sun, 3 May 2015 19:27:20 +0200 (CEST) Received: (qmail 24743 invoked by uid 0); 3 May 2015 17:27:19 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 24456 Received: from ppp-188-174-97-41.dynamic.mnet-online.de (HELO lars-adi-laptop.fritz.box) [188.174.97.41] by 217.119.54.77 with SMTP; 3 May 2015 17:27:18 -0000 From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood Date: Sun, 3 May 2015 19:27:08 +0200 Message-Id: <1430674030-1388-3-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1430674030-1388-1-git-send-email-lars@metafoo.de> References: <1430674030-1388-1-git-send-email-lars@metafoo.de> Cc: Sangbeom Kim , Charles Keepax , patches@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org, Lars-Peter Clausen Subject: [alsa-devel] [PATCH 3/5] ASoC: smartq: Remove unnecessary snd_soc_dapm_disable_pin() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The "Headphone Jack" widget is managed by the jack detection layer, there is no need to manually disable. Signed-off-by: Lars-Peter Clausen --- sound/soc/samsung/smartq_wm8987.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index dfbe2db..c75f98d 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c @@ -147,9 +147,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_nc_pin(dapm, "OUT3"); snd_soc_dapm_nc_pin(dapm, "ROUT1"); - /* set endpoints to default off mode */ - snd_soc_dapm_disable_pin(dapm, "Headphone Jack"); - /* Headphone jack detection */ err = snd_soc_card_jack_new(rtd->card, "Headphone Jack", SND_JACK_HEADPHONE, &smartq_jack,