From patchwork Thu Jan 18 16:58:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 189303 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp478761dyb; Thu, 18 Jan 2024 09:00:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IEg+Zkm0dGCCRrPBCdciEs61Mtrfo3/C5FQ5R0KGky0PIVlJ6MLikzr7BzYhdY6UfsYmh/Z X-Received: by 2002:a05:6a00:2d25:b0:6db:ae03:bdfa with SMTP id fa37-20020a056a002d2500b006dbae03bdfamr895907pfb.17.1705597212945; Thu, 18 Jan 2024 09:00:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705597212; cv=pass; d=google.com; s=arc-20160816; b=ASYDhGMSKxkxweOeAR7k+zahBbdQZI9Hk8otoVmybKj7PDLVOnCu/2zRtKInaq0NaL Hiw7gKhjBS8jsTaUCSzzQ+T72HMkwXdcz66aEW69tx84BARssO7pr8eaT5SaJHStvFSe /DYdGgh0jEdNUE/R21+1d4BpBVayWFgjwovacdb7ulKSH8LwzZhbv0itYP3TXLrFVIki jIsbnGCLOeYT/U0aWVzCAPGwhyPIbtsMmQ1ujmtnxbg9XzKGAUbZOZnC+V4Hc7OR8gZZ /ysbAqE17fEOsyTjYajZ90dQbQ0H2QxuaLbhhnBD+Pg8wCzqQJ7YeLPxZTChPQZ6Yw3F 6gGg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=HtRCPcxN7qeUy43VjEeN+G9PnnCSLHCxdgotyGmWw9E=; fh=KKP8zTcQJ3oaRk5kFpZOVuVwNJRF3rULozot/hU/FVs=; b=MCwAp5SJSTt4cuU/cz+InVfDpcY1xxObzR3OhM5p/79RT4fKJT2pDeoJg7eJVzb2hV l5XQi9T7otppmaSYnK1gNhHsEUSTdbdEeJ3LYY0d59emYc2hfeIh11g8BMZEGoMYhjCv ZfzLYh1WBqQHf5+RqmD+tfFaJUglrQCbgz1qt7xB2Ne4qe9G26yC8ZjKJhPf6mcbmu6E XOcim6vfF4dtaDUbqoZRSDMCVcVhxh3igi25dVER2Pkp5Vtmh0RFroTi8yT6inIDydim MvEyXFxhCj4ZNZAj4PC0shuRH4HSM4yJn3mv46UDVk/YtPc4fBHZabAw1sZj8gUhUWBo al5g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oVlNCGgM; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-30386-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-30386-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id y187-20020a638ac4000000b00578b487825asi1734364pgd.208.2024.01.18.09.00.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 09:00:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-30386-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oVlNCGgM; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-30386-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-30386-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id AFDCC282325 for ; Thu, 18 Jan 2024 17:00:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D00382DF73; Thu, 18 Jan 2024 16:58:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oVlNCGgM" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D6622CCD1; Thu, 18 Jan 2024 16:58:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705597106; cv=none; b=qCtecmZTYDswLEk4E0crXRhWa0g1g+WBBu/2hLsa55ljw14ZaLJbYZyUhIJIyESx+tx3rbIBWnwRfR9oLHfp5VVpd42wk+Yl/ErPAKpCFBD38g0sNMI0S+4q7kjO9mBc10z6ZwP96KycOSjV43++NQDz1dslMaG20buYxJsxA8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705597106; c=relaxed/simple; bh=XqnUEmyZpWIygAVvpTrPmcqqd9rd5+DfFZrkq8MtP5c=; h=Received:DKIM-Signature:Received:From:To:Cc:Subject:Date: Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; b=M17iMmTIwvwjBPmA9zxJJS2Idy6nEhfJOkv8Y/114r90/PtqsR/zBi9mTRQEx70mdq4ePxU9Km9VbXCeVHJAoCQBjAssaxTI/sKymJPohVHobpDkPSdLWa6aicqz9RCoze42xSVS/Fojo4/0uaLJeKpogn0kdOBdSrh7RRFm38w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oVlNCGgM; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8118C43399; Thu, 18 Jan 2024 16:58:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705597105; bh=XqnUEmyZpWIygAVvpTrPmcqqd9rd5+DfFZrkq8MtP5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oVlNCGgM9k5EJKY9p0X+kAZGLgyEu12I/iszIVU2VW44hAO8wyqGi82go/A3okkfy psZr+Yxd4ARitIFCosuNcoh6hHVYEDw1YTQR7+T+ymP/QHKRsrtbd+Pb0aVmyvZrV4 7UFOAc6TEXVJxG2dHJg7nSt4oh985u9Q3HhvuUojPEUjRgYwwvg4MsBVnfOU52N+qu UzzC6wk3HTCerUm9x2qmiIGilUJ94ka91u9pFYcPpDJcWiakzMswp5gJcvHf052S0q r2qUXDLRjXCvWUgvOHmW14C4Amf66cULbLikqYiLElgtjd2fRB5qzzZZd9ncWCgPm2 NeoTJMJJ5Ml1A== Received: from johan by xi.lan with local (Exim 4.96.2) (envelope-from ) id 1rQVir-0003Z6-33; Thu, 18 Jan 2024 17:58:33 +0100 From: Johan Hovold To: Mark Brown Cc: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v3 5/5] ASoC: codecs: wcd9335: drop unused gain hack remnant Date: Thu, 18 Jan 2024 17:58:11 +0100 Message-ID: <20240118165811.13672-6-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240118165811.13672-1-johan+linaro@kernel.org> References: <20240118165811.13672-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788448303400794300 X-GMAIL-MSGID: 1788448303400794300 The vendor driver appears to be modifying the gain settings behind the back of user space but these hacks never made it upstream except for some essentially dead code that adds a constant zero to the current gain setting on DAPM events. Note that the volume registers still need to be written after enabling clocks in order for any prior updates to take effect. Signed-off-by: Johan Hovold Reviewed-by: Srinivas Kandagatla --- sound/soc/codecs/wcd9335.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 43c648efd0d9..deb15b95992d 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -3033,7 +3033,6 @@ static int wcd9335_codec_enable_mix_path(struct snd_soc_dapm_widget *w, { struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); u16 gain_reg; - int offset_val = 0; int val = 0; switch (w->reg) { @@ -3073,7 +3072,6 @@ static int wcd9335_codec_enable_mix_path(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_POST_PMU: val = snd_soc_component_read(comp, gain_reg); - val += offset_val; snd_soc_component_write(comp, gain_reg, val); break; case SND_SOC_DAPM_POST_PMD: @@ -3294,7 +3292,6 @@ static int wcd9335_codec_enable_interpolator(struct snd_soc_dapm_widget *w, u16 gain_reg; u16 reg; int val; - int offset_val = 0; if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT0 INTERP"))) { reg = WCD9335_CDC_RX0_RX_PATH_CTL; @@ -3337,7 +3334,6 @@ static int wcd9335_codec_enable_interpolator(struct snd_soc_dapm_widget *w, case SND_SOC_DAPM_POST_PMU: wcd9335_config_compander(comp, w->shift, event); val = snd_soc_component_read(comp, gain_reg); - val += offset_val; snd_soc_component_write(comp, gain_reg, val); break; case SND_SOC_DAPM_POST_PMD: