Received: by 2002:a05:7412:ba23:b0:fa:4c10:6cad with SMTP id jp35csp934074rdb; Fri, 19 Jan 2024 03:27:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9OzeiU+eUocyF02ZiZOHw/Lc13FhjxhWDYfFESlPrf6xfN6hrqoPE+WyCMrDY4cmPkn4Q X-Received: by 2002:ad4:5c66:0:b0:681:98c7:c709 with SMTP id i6-20020ad45c66000000b0068198c7c709mr2197844qvh.129.1705663651355; Fri, 19 Jan 2024 03:27:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705663651; cv=pass; d=google.com; s=arc-20160816; b=ujW4FgIMFOfYQ52pVdN4y1yTHukOuxSxq4119h4iBu6cI1DUgsVj/yjZQ3BhtSohXd hYytz2+jMC2E1fiSh7dn0py3RXgzREXmVbXRKd654Hnnkpyu670O0olRVg/aPfcTan6c v/BpJ/sW/7ueRhHhw/OK29Fwh8NWIxDiimERBnH9/qPzGO45JKlYYfh0eO1zZlPPxBVl IQIix5oMlk48oOzYr98ds/8wjV/HW1NyxXzBPfJAyRyf32DcBb/XXp0k5v1//gceWbne YwSpCBXmlqiXaaliYcPUlqeqsOPxQiK7OELwuLmF79mm+AQ2y126jcmcNJlZSy5dCDQ0 gw8A== 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=TWG+zvrUXkAFS/ISb68RJEOQv741XDG6cNNnl0EQPKw=; fh=KKP8zTcQJ3oaRk5kFpZOVuVwNJRF3rULozot/hU/FVs=; b=P+rrG5cXDEXDaPqZCsjwBIiEN8/r5yB1JnxBsdAhP98ByQOj6TbjbQRcfcs+egb3mY gRZj0DDIS7imDFuKvzUPPm/jcxO3+A7MkSvxiKrL1UmxcQ/rwDCvapaSs1MxWO2Edies tRZThoSsMQXdevRf6A8bU395vM0N1b1DynGQwvzrGhnQeXMvsLFn3idxD35zn1JBQ5EO LgqV3nOojw+k6Dh+0kfTMXnR7N87mjeE2tEeslnsIlu5Rv0Cq5/dTIFFsBqJNIYPwP2x 2D5fnFmLrbnpeYT4ONYoOkjCDs4s02H2VtQYtKp1raCRSpNNOCSWlDN+MU7rhz9fp1ZR wuSQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LOv3dWTn; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-31089-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31089-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id f4-20020a0ccc84000000b006817772e554si6366437qvl.496.2024.01.19.03.27.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 03:27:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-31089-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LOv3dWTn; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-31089-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31089-linux.lists.archive=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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 213E31C233B8 for ; Fri, 19 Jan 2024 11:27:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5B6564D113; Fri, 19 Jan 2024 11:26:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LOv3dWTn" 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 7F9514CB46; Fri, 19 Jan 2024 11:26:55 +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=1705663615; cv=none; b=dDcIPBjBMpESYlMzFViyDE/SGuQ9mrgPEdODA2o3T2WfdAxybdzTy2LKV1gzBREphluuAluOPArljebsNqoZ03M+L1t682wv8iHE18oZ35iy5Y1LKst0QevkUgk55wQZIk+nTFWw4rkFwZqYVBewZiYK+hxKKQYn650MqFLmvBA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705663615; c=relaxed/simple; bh=PpFYWvpWvaKjfmTGZlQiejgPJGGJTyWgcH0t98eImGc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=li83hnXA6Xn+6JI5URQE+8QRqfeR429DgjCTaKKdj+HHIUDGua9Wcgw4jx2i70jc+0iAAlYf29IynORtquaU4Sg1nSRfcpYXd9B7F1JyirgZBbm3Y1hxAcDwSAaq/HsKiy6/+OFZSqpuBqyN4//ZeihTv+hQKW+ynD0WxptfhME= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LOv3dWTn; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DF41C433F1; Fri, 19 Jan 2024 11:26:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705663615; bh=PpFYWvpWvaKjfmTGZlQiejgPJGGJTyWgcH0t98eImGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LOv3dWTn/xun4+yxYIoHQJHUvUT9bpLoYo7/MsTt7I5e8n6ZfMVgF6SoiZNeggqpT rIPzMilJGJEVZ7ynlvccEVWcfpY1BUTsl9KGTnT3JvPPqrG5HgX6/7D9yCzMjh0mbP bcrUe0BhnGRqvP6NyuddgUVvnchYROjsi4rIiZKF1jFVijuxkuUmhR6nGWz2qxN9tJ CuEzKSKjMZWPqgTcxqE4uX9mBrfftWaUDURjCIf6K1VGL6kgRx7jlKp+hReKApr+31 kxazD5OXJGQHij/bCzSFIHg7qdHehD8ejedFLFX+avr27SYERF0ghtFZIzqmS1ISPp 3UVsXfHKTyBbg== Received: from johan by xi.lan with local (Exim 4.96.2) (envelope-from ) id 1rQn1c-0001xP-0G; Fri, 19 Jan 2024 12:27:04 +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 v4 4/4] ASoC: codecs: wcd9335: drop unused gain hack remnant Date: Fri, 19 Jan 2024 12:24:20 +0100 Message-ID: <20240119112420.7446-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240119112420.7446-1-johan+linaro@kernel.org> References: <20240119112420.7446-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 Content-Transfer-Encoding: 8bit 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. Reviewed-by: Srinivas Kandagatla Signed-off-by: Johan Hovold --- 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: -- 2.41.0