From nobody Wed Oct 8 14:22:45 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 4D25A2EA485 for ; Fri, 27 Jun 2025 15:51:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751039504; cv=none; b=MpVwL+SPzl7ZnS07ocSbfr9umiPwrmfx5EvIEkYw8/q9gW2n8H3dNxg/ln0RY6SZS6tegncjJhdvGa/tWCFneQtb2NCShw6Z0eqPn7X2bLJn6EOEHpCQ7B7Ooerfa7VeplX2kNLE6MHXDzMq0bz28RQqqWsP44PKc/JrWDPBUhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751039504; c=relaxed/simple; bh=VszKiwE03t1FNDyd3+/PG4rNfxJCf7hH5fFaj1c3B+M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R/uqi6BTIFmgOjLmrwYivt7fPRJXuQk43geUFLUH0zJCYSMJs2N3ei5C+3dUYyALrlcKYE7CC1ZKfncR4k7Z1lpSvqkhxjDVzgNpX9mEd74bHI9EMtdD/KnboKfzh4sGGMSDO5Yf0OqVGbCCi2FBSZDWRiOwpiDylGOYDJrDIbM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Of4iI84/; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Of4iI84/" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55RCGOiG015139 for ; Fri, 27 Jun 2025 15:51:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=Mxfmtrvq+gi LYyamC8Jt+iTgA2yVNVmMcYpWvKggyC0=; b=Of4iI84/gzV90+ks43um52HnGk9 ZFqFw4iI54qVqlQhGWmPZc7bWzwXek8tLS5hPpssQnPsRDikmKMqHNdiMPQejx1s +Wbbl0WnF2oHptagJffCAdehOzN2RhVsfFdRCZxFinLb9w5m7YDM5JjrMFB4FYpH ZQ1izbsATDD0mnqYZWsIQtFWH+OYfDNets+BBlRSuKgdIGL1yUJe/0hDx1gDzKCk 8a5Szf6h/3wg8hyjRMAxcu9dQERn4tcDU2oOZDRcNeDt3c42bBqJCHwB99wTv1C9 7zTN1RFJ9+qixDBsvdILW/4xLtWJhEqC7PfdW0m6V44+aETg6RNnmO7Cw3g== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47fbm25xg8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 27 Jun 2025 15:51:41 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7d413a10b4cso377966985a.1 for ; Fri, 27 Jun 2025 08:51:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751039500; x=1751644300; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mxfmtrvq+giLYyamC8Jt+iTgA2yVNVmMcYpWvKggyC0=; b=YJ9K6eVPojRzzQ/PFgThOOerDt6h2mVyMF7AdFPx5pXWXBhZ9F3s5cHxK0ysoqmDHa FfGKXIQwbGKFKsz/WYs2bgiUYcH7JcXqSHV3RTPf5R7xMnqkNcJCTbX1LtZc56ZA55bv fGNWeMz+iJGW87smBuCCjzHr8twvttBNDbDn5gNcaZh2l0sNZMZ9jAjdjf2MsEnG/l/T zfkvhTiaR2RKoRCbotiZ/YD9bk6ptPndYnKOKOrXlE+WqFAjhizrxQYcdiS7iUW0qKU4 Itx6GWAbEgKj2JeXtxGUHW3BcEwu3iKNVyTc0H01huOxjWHpks9o5Vi06qOmf94sUzmz em6Q== X-Forwarded-Encrypted: i=1; AJvYcCVVynZtk66SWfQ2Rq3p4uPNXM/lLwd6Yc0i4lD0GUAUwswO4gSdiYgiX69feorDSMa+Flhb+/g/xhz/WCc=@vger.kernel.org X-Gm-Message-State: AOJu0YyuYXfrdk5+T8ExsEro3S8vmyKEPsaaNujXPkMx6opJGu+lTNFR UOmmv38HZqksZ0H2q8B5gZHj/jT4RDS8L12KNo+5V7WEr7IRSBAOhea5K8e+/dIxzMQjR2oU1xD vddLaLSeyXfwu/p3vb/BWBrtsYnFfj29tdHdZu8taHepFGbd6ZfPM90Rbe8I89e+QHCM= X-Gm-Gg: ASbGncvvnY5ZfRwPHCeGbxyjnzr6j400icEsi6SZfOw/RSYbcoX5SHB/dGXkf7eIbf4 /XjnDg7B7SCi/6ByUTQvkfexGf/sv9KDu9S2pxR5mvuOlfkF3CgYWj9iF24/WqVh/j1dWvzCqzr j9rQbt6qM0jEQzcnwBMst4hKKLQ2jIJplN9RfTEUdid8YNpnHAXCB9hruk3NCb5vMhUiOtwVtxv 08Tb7dJTMRrsGEZAeUQVSm5UqrRU2NfS3NmbXpABX8miuIOBIH5Kxh50dGwhjuL+hhjxnvrkOar ppdOrWQeiWx7EUXJVdwjMx+FF7cKP3F5+/zF7sEHgoQdBbeA1IsPdwI= X-Received: by 2002:a05:620a:4547:b0:7cd:45ed:c4a5 with SMTP id af79cd13be357-7d44385e947mr497082985a.0.1751039500220; Fri, 27 Jun 2025 08:51:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+PxZlXtSSHqqv60AqWQfGMamHBF1e3cuJ6Z+/HPHmbzZbS06rUYAe0pTdNDgxbScKp+W+FQ== X-Received: by 2002:a05:620a:4547:b0:7cd:45ed:c4a5 with SMTP id af79cd13be357-7d44385e947mr497078485a.0.1751039499757; Fri, 27 Jun 2025 08:51:39 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a892e5f8absm3082663f8f.95.2025.06.27.08.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jun 2025 08:51:39 -0700 (PDT) From: srinivas.kandagatla@oss.qualcomm.com To: vkoul@kernel.org, broonie@kernel.org Cc: yung-chuan.liao@linux.intel.com, pierre-louis.bossart@linux.dev, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, krzysztof.kozlowski@linaro.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 4/4] ASoC: codecs: wcdxxxx: use sdw_slave_get_current_bank helper Date: Fri, 27 Jun 2025 16:51:03 +0100 Message-ID: <20250627155103.441547-5-srinivas.kandagatla@oss.qualcomm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250627155103.441547-1-srinivas.kandagatla@oss.qualcomm.com> References: <20250627155103.441547-1-srinivas.kandagatla@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=YYu95xRf c=1 sm=1 tr=0 ts=685ebe0d cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=WmG1VI7HpiTX60UEcG8A:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-GUID: G4yFz2DVMiZ8a764GLvz1NsIX7oV91Pu X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI3MDEyOSBTYWx0ZWRfXxc6uNa/eYYY2 TCfKQhC1luB4v7XbAJ40f08lwIRavHmK+GoWvCYQDqHyrGPF2hM23YtLUWrcq6FM5ONPxmXo4Gq TShh8IZk+yGGf69ChgmIjHBWtaAqvHix4wGMWoQ2KwoZFOGKdalY84QoCewDFQH1t4uodpjzC0b Yk7KoqraWD1CDiIdICJu5V7/JacT3XXT4P7XuBIZVMYgKMbbDk0wrfL+cHm+rlLlDS6vT2UHU8v f2yDuHEZS2Y4U1N03yiO6U5VWIk4DrjYHkP7q3ZYKzYbJPw4DDnNs7tGP2WWJpk1OimaVxEa5Z4 y5Kv8I9tyWkHbuPTYR2RnVEQs4PwiMLQEqlxCKMcZjfoHQScGxwa4LTHDDBgXqUswI50ijy0l7M cl8UGnA5gtUBbL0MbKrnCZwO92S5OQXzA4evPiKRwNkPkvmzqhXEYARIMpNSbdvV5qsM+fxh X-Proofpoint-ORIG-GUID: G4yFz2DVMiZ8a764GLvz1NsIX7oV91Pu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-27_05,2025-06-26_05,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 spamscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 mlxlogscore=999 clxscore=1015 mlxscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506270129 Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla use sdw_slave_get_current_bank() helper function, rather than duplicating this function in every codec driver. Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/wcd938x-sdw.c | 10 ---------- sound/soc/codecs/wcd938x.c | 3 +-- sound/soc/codecs/wcd938x.h | 7 ------- sound/soc/codecs/wcd939x-sdw.c | 7 ------- sound/soc/codecs/wcd939x.c | 2 +- sound/soc/codecs/wcd939x.h | 7 ------- 6 files changed, 2 insertions(+), 34 deletions(-) diff --git a/sound/soc/codecs/wcd938x-sdw.c b/sound/soc/codecs/wcd938x-sdw.c index b4a0b66b34df..9e411d906354 100644 --- a/sound/soc/codecs/wcd938x-sdw.c +++ b/sound/soc/codecs/wcd938x-sdw.c @@ -82,16 +82,6 @@ static struct sdw_dpn_prop wcd938x_dpn_prop[WCD938X_MAX_= SWR_PORTS] =3D { } }; =20 -int wcd938x_swr_get_current_bank(struct sdw_slave *sdev) -{ - int bank; - - bank =3D sdw_read(sdev, SDW_SCP_CTRL); - - return ((bank & 0x40) ? 1 : 0); -} -EXPORT_SYMBOL_GPL(wcd938x_swr_get_current_bank); - int wcd938x_sdw_hw_params(struct wcd938x_sdw_priv *wcd, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index 7c345217298d..7e1e99b22cb8 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -1097,8 +1097,7 @@ static int wcd938x_tx_swr_ctrl(struct snd_soc_dapm_wi= dget *w, int bank; int rate; =20 - bank =3D (wcd938x_swr_get_current_bank(wcd938x->sdw_priv[AIF1_CAP]->sdev)= ) ? 0 : 1; - bank =3D bank ? 0 : 1; + bank =3D sdw_slave_get_current_bank(wcd938x->sdw_priv[AIF1_CAP]->sdev); =20 switch (event) { case SND_SOC_DAPM_PRE_PMU: diff --git a/sound/soc/codecs/wcd938x.h b/sound/soc/codecs/wcd938x.h index dbafcae247f4..54ee56b7fbd6 100644 --- a/sound/soc/codecs/wcd938x.h +++ b/sound/soc/codecs/wcd938x.h @@ -669,9 +669,6 @@ int wcd938x_sdw_hw_params(struct wcd938x_sdw_priv *wcd, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai); - -int wcd938x_swr_get_current_bank(struct sdw_slave *sdev); - #else =20 static inline int wcd938x_sdw_free(struct wcd938x_sdw_priv *wcd, @@ -696,9 +693,5 @@ static inline int wcd938x_sdw_hw_params(struct wcd938x_= sdw_priv *wcd, return -EOPNOTSUPP; } =20 -static inline int wcd938x_swr_get_current_bank(struct sdw_slave *sdev) -{ - return 0; -} #endif /* CONFIG_SND_SOC_WCD938X_SDW */ #endif /* __WCD938X_H__ */ diff --git a/sound/soc/codecs/wcd939x-sdw.c b/sound/soc/codecs/wcd939x-sdw.c index e487a1bb0194..477d6cf27d32 100644 --- a/sound/soc/codecs/wcd939x-sdw.c +++ b/sound/soc/codecs/wcd939x-sdw.c @@ -128,13 +128,6 @@ static struct sdw_dpn_prop wcd939x_tx_dpn_prop[WCD939X= _MAX_TX_SWR_PORTS] =3D { } }; =20 -unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *sdev) -{ - return FIELD_GET(SDW_SCP_STAT_CURR_BANK, - sdw_read(sdev, SDW_SCP_CTRL)); -} -EXPORT_SYMBOL_GPL(wcd939x_swr_get_current_bank); - int wcd939x_sdw_hw_params(struct wcd939x_sdw_priv *wcd, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c index 0727af4789cb..f59bda0ad089 100644 --- a/sound/soc/codecs/wcd939x.c +++ b/sound/soc/codecs/wcd939x.c @@ -1014,7 +1014,7 @@ static int wcd939x_tx_swr_ctrl(struct snd_soc_dapm_wi= dget *w, int bank; int rate; =20 - bank =3D wcd939x_swr_get_current_bank(wcd939x->sdw_priv[AIF1_CAP]->sdev); + bank =3D sdw_slave_get_current_bank(wcd939x->sdw_priv[AIF1_CAP]->sdev); =20 switch (event) { case SND_SOC_DAPM_PRE_PMU: diff --git a/sound/soc/codecs/wcd939x.h b/sound/soc/codecs/wcd939x.h index 3f189e5cafd5..e70445b1a4bc 100644 --- a/sound/soc/codecs/wcd939x.h +++ b/sound/soc/codecs/wcd939x.h @@ -930,8 +930,6 @@ int wcd939x_sdw_hw_params(struct wcd939x_sdw_priv *wcd, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai); =20 -unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *sdev); - struct regmap *wcd939x_swr_get_regmap(struct wcd939x_sdw_priv *wcd); #else =20 @@ -957,11 +955,6 @@ static inline int wcd939x_sdw_hw_params(struct wcd939x= _sdw_priv *wcd, return -EOPNOTSUPP; } =20 -static inline unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *= sdev) -{ - return 0; -} - struct regmap *wcd939x_swr_get_regmap(struct wcd939x_sdw_priv *wcd) { return PTR_ERR(-EINVAL); --=20 2.49.0