From patchwork Mon Oct 9 10:44:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 115199 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2399266qgn; Mon, 9 Oct 2017 03:44:45 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDk8EkVwHTTEHBJu+L4pPT3GQFbtpz+vWs5wrgoLVxCfaSkemrEAMZttMXpda5yCenaayyO X-Received: by 10.223.158.145 with SMTP id a17mr10135486wrf.47.1507545884927; Mon, 09 Oct 2017 03:44:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507545884; cv=none; d=google.com; s=arc-20160816; b=qYYxsJfkSMiTll1l6HrN2I3JgYPMISkgVGdynyqXBRtWfZTJZH8IQLDoP2UN2u01zQ fyULx544v+Mcl2XJLmlv9GI0js7C1wYrx68XAEOBA3Kdern5LqyjC+K2Ec6pxkoGH+iT Vyg0t/55MmnY9zuSNz2XEidLMH2kG84mEVy88+1tHG8o1XNQ9vGTcQY1W39oqwM+uAs7 sPIAerfZQ0+1gO6z4T5jUQ02IckDPrk8d80qvE+++oreFiW7Song4yf9j1VhUfxaGCPp c5kdfyJNaqnV59+UrPj5ZxOPCKvheLkx8jw75ec1kL5cZa6pb/NeaZNteeH2exuoWxoU 9zsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=rL5M/B+A7Xjc2ahFMn0ceb+pN4i3vMzjOx5KGX5h4bk=; b=fvIW904FPbwFGZY4iO1GqEOSjhSoTi/ntfmLdNqb5jlSKaVUFeo8BcXWKzCHFaBrX2 X0AnJipfAq0pz85cXSOPllq/pMrTGCizoqnv9bflDrzj8AAql9ofv0dtLFhNKIHDiHMs 0l+H5O6mwtgLNYSLpQbmngC5EPuT2NP+A0CV798zmsF2yZTXpmG6S5Ft4wv2J0ZYAlo7 m5T0oAAX6yN1qwUBsMtPGM0iIT31JCvS/cSQId+dtpmVN2QDNcbTxcg53JfCrg9e8qFf e7hAujy0RfB3A374y8ahe2pRJIleE0jzYdgJ+9WWRIc27SrrYlh6yt4hmFZfmrPCTYVB eoHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=aKCwqTd1; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id z3si7463535wrb.55.2017.10.09.03.44.44; Mon, 09 Oct 2017 03:44:44 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=aKCwqTd1; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 19F85266D77; Mon, 9 Oct 2017 12:44:43 +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 6105E266D77; Mon, 9 Oct 2017 12:44:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_NEUTRAL autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id E87DA266B38 for ; Mon, 9 Oct 2017 12:44:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=FxZo2F+OlOItgBABssBxceXrpznwvM7g99DgQxWCPB4=; b=aKCwqTd1hJyP nvFHU/wR/kOtM1otAFd8ZXSwjNlNCSdxgaPPgN1KYBZilwPR19oAEOfl1U/cHsxCuuf2e+NaCR3a+ 8aQgQ1jrhl+Babsn0UQyaoPX3TUOnQaQBXaSDs13X7JmSGnPSUfFlq+27rNMN7rMSiPX6PcNTPCIc ZvfkM=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1e1VXy-0000tU-21; Mon, 09 Oct 2017 10:44:30 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1e1VXx-0001hE-LN; Mon, 09 Oct 2017 11:44:29 +0100 From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20171005040427.26612-1-pierre-louis.bossart@linux.intel.com> Message-Id: Date: Mon, 09 Oct 2017 11:44:29 +0100 Cc: vinod.koul@intel.com, broonie@kernel.org, Thierry Escande , alsa-devel@alsa-project.org Subject: [alsa-devel] Applied "ASoC: Intel: cht_bsw_max98090: remove useless code, align with ChromeOS driver" to the asoc tree 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 The patch ASoC: Intel: cht_bsw_max98090: remove useless code, align with ChromeOS driver has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 0087f2013188d8b332cee2f74fd3c6754a49f620 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Wed, 4 Oct 2017 23:04:27 -0500 Subject: [PATCH] ASoC: Intel: cht_bsw_max98090: remove useless code, align with ChromeOS driver Remove dead code which was missed in previous changes. This is not visible with git diff but there is a test+return on the same condition just above. Also reuse local variable instead of fetching the jack information twice. Tested on Acer R11 (cyan) Fixes: 3bbda5a38601 ('ASoC: Intel: cht_bsw_max98090_ti: Fix jack initialization') Cc: Thierry Escande Signed-off-by: Pierre-Louis Bossart Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.14.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index 6519604b9577..a23eba7bb056 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -219,10 +219,6 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) return ret; } - - if (ctx->ts3a227e_present) - snd_soc_jack_notifier_register(jack, &cht_jack_nb); - ret = snd_soc_jack_add_gpiods(runtime->card->dev->parent, jack, ARRAY_SIZE(hs_jack_gpios), hs_jack_gpios); @@ -323,7 +319,7 @@ static int cht_max98090_headset_init(struct snd_soc_component *component) return ret; } - return ts3a227e_enable_jack_detect(component, &ctx->jack); + return ts3a227e_enable_jack_detect(component, jack); } static const struct snd_soc_ops cht_aif1_ops = {