From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18EC6CDB474 for ; Mon, 23 Oct 2023 09:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233289AbjJWJyp (ORCPT ); Mon, 23 Oct 2023 05:54:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232476AbjJWJyj (ORCPT ); Mon, 23 Oct 2023 05:54:39 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23CC9E6 for ; Mon, 23 Oct 2023 02:54:37 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-32d834ec222so2098493f8f.0 for ; Mon, 23 Oct 2023 02:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054875; x=1698659675; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4YC/W8702n/IhtK2/nRJYRFXj5SA3+z6eWXwAmZT4eY=; b=z8wzB8ADL91wvnnXhOGSny0rBqZvEsstAaA622VYDARD0xigKUTqXyak+lEh8S0YQO AkjrNpQXEyRaRszo1z3IYkKQNiU0gRG62OdzhB9vohlAkm+thWM+PpELgG94GSn3n/lf 4wEOsr37gIReLlnkN9fqZNvgaprkJ0F71vh6PdD8LeE0G8yuvLk9idvMd/QZ7RnMtIx+ AkjltU+uoXU+SXhOpPrFJo7TXlMEo0zeLW+vZgHwWM2N+M+dhtL+ttiFsXvrtZ4nnk1v lb4AmITxRCfVvHvUktw/RY0kveaJdfItkNEWcrZjyjtr2eJmF4vZaqpBuXm/kIw+DLL5 raoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054875; x=1698659675; 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=4YC/W8702n/IhtK2/nRJYRFXj5SA3+z6eWXwAmZT4eY=; b=A4dgRIyMTkXhBysYr/LuPyHtFsAxWEI+4KVoGU0GLV18tGGRa3ZQl5ftRubzJudZ8Y rRcK5GLs0PAyK8Rw8vIvFHVnHc/ZX8gRc5a4to/p/AC4fMYMCNL4Yv4zWZrqnXQyzVmd U0rcGcuzfEwDhqs9Dq9diCzPcB90yALq4R+NDi3x8eT+C3vCz9dbF4uiDz1C+LrSjkqv hT5Xh/8G8dNu7GEul9AIzcy7nTuxOO12T5cMYXbBmy7xsRWBrLze3Lz3klaL6HHZjEu/ U/s+NpezyZ0d6CXHSOhIhx3SyBWvvG4C6Gm4OlAqMNx6CXHn63k1wuvtk5xxCU2o9i6o 0rTQ== X-Gm-Message-State: AOJu0Yw0hWcTN9aalyZgN64MWeZxV7XL1saZBfRw59LfqWW/avT7eBmp W9I8ZbPWEngkIAxUHMTcWA0S9g== X-Google-Smtp-Source: AGHT+IEHt7MU0pVVH3QtAU35Dth6+VQAGLU4qZyA/p6jZNdd35Imw6TEqgJZWhxMs2mnHadLP+Eb6A== X-Received: by 2002:adf:fc09:0:b0:323:10b8:543e with SMTP id i9-20020adffc09000000b0032310b8543emr5848249wrr.49.1698054875438; Mon, 23 Oct 2023 02:54:35 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:35 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 01/17] ASoC: codecs: 88pm860x: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:12 +0200 Message-Id: <20231023095428.166563-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/88pm860x-codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-= codec.c index d99b674d574b..be01f0928393 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -400,9 +400,9 @@ static int pm860x_dac_event(struct snd_soc_dapm_widget = *w, unsigned int dac =3D 0; int data; =20 - if (!strcmp(w->name, "Left DAC")) + if (!snd_soc_dapm_widget_name_cmp(w, "Left DAC")) dac =3D DAC_LEFT; - if (!strcmp(w->name, "Right DAC")) + if (!snd_soc_dapm_widget_name_cmp(w, "Right DAC")) dac =3D DAC_RIGHT; switch (event) { case SND_SOC_DAPM_PRE_PMU: --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 998EFC25B41 for ; Mon, 23 Oct 2023 09:54:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233044AbjJWJys (ORCPT ); Mon, 23 Oct 2023 05:54:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233168AbjJWJyl (ORCPT ); Mon, 23 Oct 2023 05:54:41 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDE81D6 for ; Mon, 23 Oct 2023 02:54:38 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-32daeed7771so2082371f8f.3 for ; Mon, 23 Oct 2023 02:54:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054877; x=1698659677; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xJErgU+nUAjpf1N+MX3RFSZtoYrYFdNiReNrVNbPccY=; b=hmVeL1P/ij1fv6Iv9vFwD9B3HWyQfQMCIaVad7JXndz7emTjBmt3LbnG/Umkhw/K3i m9ssoZtsBTsgwoI/RY9gzD0Ei8klrTy6S2GBhd8D44RGQZtIWQM11QyyknVQzXdLm3GT 1cLXuyMZ9Tvao3v6hx6j/YlKf1ejvEM+SC48Kkv0wYjoRb/CpIyOjAA+poD6WC6qDGHc 9iw+GKImIu2SP1qm8DIVgypIvvCGcennBJ+vJjjOZVtJ7rHIUKcdRst1TcSR9l0h4upC 0mnrQO0aTDSoguHJaBkgBaaY70XgDx6UEftJnF/4x2iWmSag/izSj+CNP2+4VmHMKPM2 sVRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054877; x=1698659677; 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=xJErgU+nUAjpf1N+MX3RFSZtoYrYFdNiReNrVNbPccY=; b=MuY2S8E/TnW5Qf1/OynkaPhQvYeezTJXPXLUKyouKMZCqcfkU3GxP3yh/Oi8etdWM6 EKWTTsPfocOiSR6uh3zBaPorQwHBoANYBXY+Qkp6wPaOITPV8KZykc4Cjy37DTE1YGxj 1/AVd7et1Jq3UpNZDKKVdzkS3tjZZXtyh9paZLHnhYYXSSwqWkaYap4mPrhSLdJd+vSP Gl70+wx++Z9vLmYqe6t3+FZDrAIbgrm6spVH7MQrBELeDMq4Nkhp02iaort2mYDJ2fzY le4bxHpOI+assXJTtuZFjOkeFfUpjuRLPjtcBINlHQlVsij1jqR20ltgxMEzmmW9lnMk 8WcQ== X-Gm-Message-State: AOJu0YzqS7/c3p8ddwr1xTdYmwy8k+yed/UvUJXI+P29VtAa9WnAFnpb vtD2je2KGt15VabI/ueRzEJMxQ== X-Google-Smtp-Source: AGHT+IGm+wzbFOSTt4RIIX0gXAgxOLyRHhiU4Y3meUgY+Qffx0kn9EZ6h3swR1er/PSz6I6OP4nsNQ== X-Received: by 2002:a5d:4483:0:b0:319:8a66:f695 with SMTP id j3-20020a5d4483000000b003198a66f695mr6356947wrq.55.1698054877529; Mon, 23 Oct 2023 02:54:37 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:37 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 02/17] ASoC: codecs: adau1373: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:13 +0200 Message-Id: <20231023095428.166563-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Nuno Sa --- sound/soc/codecs/adau1373.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c index b0ab0a69b207..3582c4b968a0 100644 --- a/sound/soc/codecs/adau1373.c +++ b/sound/soc/codecs/adau1373.c @@ -834,7 +834,7 @@ static int adau1373_check_aif_clk(struct snd_soc_dapm_w= idget *source, else clk =3D "SYSCLK2"; =20 - return strcmp(source->name, clk) =3D=3D 0; + return snd_soc_dapm_widget_name_cmp(source, clk) =3D=3D 0; } =20 static int adau1373_check_src(struct snd_soc_dapm_widget *source, --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB475C00A8F for ; Mon, 23 Oct 2023 09:54:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233368AbjJWJyx (ORCPT ); Mon, 23 Oct 2023 05:54:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233297AbjJWJyp (ORCPT ); Mon, 23 Oct 2023 05:54:45 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BF39FC for ; Mon, 23 Oct 2023 02:54:41 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-31fa15f4cc6so2227089f8f.2 for ; Mon, 23 Oct 2023 02:54:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054879; x=1698659679; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P05PzWbQ4hBl2fNZN6KJaeVrZFnQ7VS3APzpcXPmWmM=; b=YyDzZncK1SgwNW8rl1WP9CGxpz9ct7i6WJ/499vb1v5JotULi+8q8XvQkkrJhCo0LE pX8cNofs2Tg4KWQOSr/zPBGkIRMtp1rpV9GGiOyPkWCrIOQlb3kY/g7APkMBvGA6qq0J uOOdz+Tjjue5Vssjbxj1/x3+stedYP7onNInINMnWiYC8cICOPSKN1j/BTthbT+NDnzb HTrs1Cd9hnNtMPnrSidKxLfhQzCZwsLphCjjCwtFg79hmoc9VZagiA2Wo0SHsUeK7XPV 3Exp506pfU0Lvvfpy1Av4ttNcFoEpY0pWxJZpZq4mKWEXfOh+/sn8AeDg1uzBjxRx9Xa P9aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054879; x=1698659679; 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=P05PzWbQ4hBl2fNZN6KJaeVrZFnQ7VS3APzpcXPmWmM=; b=TP3uIpKGBJfBPEVT0PkOOOaw6M3JG603AjPVwQYyuWylBwfh6MhLdlF12JNNLeR+iL S2C9J/c9fsyPwLXwq7ebu5FsoOXFWMBd+TPDLyyRpFRyi9WprQ0ji8+Kn3PqO0+eXUqx elPZ5HD2wGAMtCXdu6I7OVGXhcAtPB0xDPXljo7duJ6Y4s+ai1aipz3tRwAqTvTFStLX 6vYeVOk4NTTwlFYYeYPh7y0U9r1W2BhcHgf/ppfF6vArP4JOXXrwbo3cWrmqq4YmyUZV BzkGeuzX+j2m47Hka+JNMZ1le5yff+acuuvArvfltMIntBM4GKBW1ubuGHYmEJrIxBGX eB/g== X-Gm-Message-State: AOJu0YyyTgR+iLUlBfFbPmAnLgfnCYyn2cBrzo0zFFmJ3bONYEbpd8qR A3vdmI3ogi68aousbD6Fs/Fbug== X-Google-Smtp-Source: AGHT+IE7M5wXmUXIEeObjapurzse0V6MkE8fsf1gV1jhgG074/79sH+mXQ9giKjm7AVwWA1w8KdepA== X-Received: by 2002:a5d:67c5:0:b0:32d:b7d4:b90 with SMTP id n5-20020a5d67c5000000b0032db7d40b90mr4943276wrw.39.1698054879636; Mon, 23 Oct 2023 02:54:39 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:39 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 03/17] ASoC: codecs: adav80x: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:14 +0200 Message-Id: <20231023095428.166563-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Nuno Sa --- sound/soc/codecs/adav80x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index bb08969c5917..c8c0fc928211 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -229,7 +229,7 @@ static int adav80x_dapm_sysclk_check(struct snd_soc_dap= m_widget *source, return 0; } =20 - return strcmp(source->name, clk) =3D=3D 0; + return snd_soc_dapm_widget_name_cmp(source, clk) =3D=3D 0; } =20 static int adav80x_dapm_pll_check(struct snd_soc_dapm_widget *source, --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36C4CC004C0 for ; Mon, 23 Oct 2023 09:54:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233414AbjJWJy6 (ORCPT ); Mon, 23 Oct 2023 05:54:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233344AbjJWJyp (ORCPT ); Mon, 23 Oct 2023 05:54:45 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB31C10C9 for ; Mon, 23 Oct 2023 02:54:43 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-32db8f8441eso2495980f8f.0 for ; Mon, 23 Oct 2023 02:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054882; x=1698659682; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xuBgkJ0BPVMUW15lL794m55ZCdp9DH+A+t98MliJqVQ=; b=Zj9OmFDc7H0EOLdlEIyihpTwTgsjQha9cs5zBhn7fhSUHvTAnfDk3ZdkbBXgm2q4OC QJhpxZSqEcXIp4OE7d6pV475j/OpwtaLxp04kqRDiRgTlXaSM+mVIdARA5K2ADUHvOCk 3VvwWTYzCCUAp4w/pLuuJe8Eg6AGGHXPYhP1muAACKRmpc6ovPdC3e4XZvQQifiCfrkS Uw2HUGT+5VdZVAuaq0dpnoGZTtsXGgQFmzCb9vZesk+mbRgCcKieM9+U9wcXK9YkQepi rd06ebYwYKYZnWPzXD9Ig6u4ClYDOrJKQpS9j5D6vzGzjT2tIswMvhNXcab0MQySziVU mtSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054882; x=1698659682; 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=xuBgkJ0BPVMUW15lL794m55ZCdp9DH+A+t98MliJqVQ=; b=UO+PwajOP9SKS+7vThxGTy6/yIN5gaJo+rlboHrtl/JMPssbEJ+evxQFWgr2i4ygmO colOW2374qKYZ7Rr0phvnTaggrQxcZ34eHOzC9DukWIQFiwqOwq/Mee8VAsRMJ/h7MUt RJ+ipxjkKnJ6MOcfCrLmo4xZ/T2bc33fcEwdoN96+fySH/K0ktFFtJNkZ7erpvI9R4D1 KE1tKTVL+wrdDKVN4CYNgC7djx+Fjy0SSsRR0JTBxzEXmbUnII0VOOxs+6mPjreTjziv hXOrBbpQ9QAnxly24bNLkzX+q6Kw/UH/y72igIw8tJCm5Vd/znhsn2Scjz/XktFAhYUk AGrQ== X-Gm-Message-State: AOJu0Yx9vZSA9be53/AoCvOs4mtv54mjInDiTL7SSQIEke1rl1pgDgXP 4KvAQ4DovccBpE1gD5ZMIwnRqA== X-Google-Smtp-Source: AGHT+IG3Sib29NO6K06c5CyIqf4YSqLzbtzzhUEleL/6uhtgyT7dZmxfyYTlGNAw3kPpeYYlW/TKCQ== X-Received: by 2002:a05:6000:152:b0:31f:8999:c409 with SMTP id r18-20020a056000015200b0031f8999c409mr6421464wrx.66.1698054882090; Mon, 23 Oct 2023 02:54:42 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:41 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 04/17] ASoC: codecs: lpass-rx-macro: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:15 +0200 Message-Id: <20231023095428.166563-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/lpass-rx-macro.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-= macro.c index 29197d34ec09..f35187d69cac 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -2906,14 +2906,14 @@ static int rx_macro_enable_echo(struct snd_soc_dapm= _widget *w, =20 val =3D snd_soc_component_read(component, CDC_RX_INP_MUX_RX_MIX_CFG4); - if (!(strcmp(w->name, "RX MIX TX0 MUX"))) + if (!(snd_soc_dapm_widget_name_cmp(w, "RX MIX TX0 MUX"))) ec_tx =3D ((val & 0xf0) >> 0x4) - 1; - else if (!(strcmp(w->name, "RX MIX TX1 MUX"))) + else if (!(snd_soc_dapm_widget_name_cmp(w, "RX MIX TX1 MUX"))) ec_tx =3D (val & 0x0f) - 1; =20 val =3D snd_soc_component_read(component, CDC_RX_INP_MUX_RX_MIX_CFG5); - if (!(strcmp(w->name, "RX MIX TX2 MUX"))) + if (!(snd_soc_dapm_widget_name_cmp(w, "RX MIX TX2 MUX"))) ec_tx =3D (val & 0x0f) - 1; =20 if (ec_tx < 0 || (ec_tx >=3D RX_MACRO_EC_MUX_MAX)) { --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1D5CC004C0 for ; Mon, 23 Oct 2023 09:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233352AbjJWJzD (ORCPT ); Mon, 23 Oct 2023 05:55:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233308AbjJWJys (ORCPT ); Mon, 23 Oct 2023 05:54:48 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5752DF for ; Mon, 23 Oct 2023 02:54:45 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-32da9ef390fso2147591f8f.2 for ; Mon, 23 Oct 2023 02:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054884; x=1698659684; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TezS6fAbmZRfIE/9gAJPYUtZvuonet12GZ8K7ihJ9/I=; b=ayJhQrpXmLmMXWo1EwzEqgPt++PCP8UH54XqBtXG4HoxoZG6P8WO3bRbxxOGjerUUT 7Htx1d5FbDG9piodG2LDi2AxETFHr9R/XVQWeO8EIYz++bBQp/8kXCvWRNW0wuiQYxJB dv1SBgFSCpGf9LsXPOrvldEzO/2JdfzmC71rFVbbabfKwSlhixo7/6a0DAaQ70/EGxhx qyfhgIfeHd7MITkf23r0XmZJAEASQFzDVFIQy4sCbftIP4MxZvaZphl5wDhTn6Jkhjzo bxOgyFMWvWll9IVGBcUmuBsRv5xx3asLYV/Mbd++wonwNkk9AMYE6cGTd2nIjEsmmQLq 9+DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054884; x=1698659684; 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=TezS6fAbmZRfIE/9gAJPYUtZvuonet12GZ8K7ihJ9/I=; b=A7TO+8fhHTfv2LnxmAkMAwcw0RF58j5RLzI6YexIhKFjwHAPnUwv21F3J5N/6feF0H 7APHE5CGJ7yDIn3cp2XaPpqdGVWOQ8a2t3ZcB0SMmnE5eXDpJpNmVfE9b6egrHicZoS+ Q2nsxbv10Z+gC3/wi0NSTAJUfvL2ZOEa/IqrfBhbsdFUA1n6NxJSqXP7/1LWsTci/I1h uPAxzGUrIjqQMeF/gci/szry1k/8F7PWCAlZElRniPrDb1AevY4wbN3G/074HC46oPCC 3ypWTdHMXuYVw5Z/Cxxj8gfgTzxvXstDlKAvvY2DS8oNIeQGeJ5Rf4nWuoxpjdtWEWHQ scZA== X-Gm-Message-State: AOJu0YwmzDQJ+upjh/Bol2UYUV9gDuujmbmeGCrjIT2AY5dRFcg8LdGi beMw/cjha58AGGetgnOWB0N3bw== X-Google-Smtp-Source: AGHT+IHsx/9dXkgIRE0i/tyQBHSemsOVRBosIhYnxE5jqsYSPyBJogKhqbIAWQxRyZ17AF8k0sON7w== X-Received: by 2002:adf:f603:0:b0:31a:d450:c513 with SMTP id t3-20020adff603000000b0031ad450c513mr6210328wrp.26.1698054884307; Mon, 23 Oct 2023 02:54:44 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:43 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 05/17] ASoC: codecs: max9867: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:16 +0200 Message-Id: <20231023095428.166563-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Nuno Sa --- sound/soc/codecs/max9867.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index b616ad39858c..3b9dd158c34b 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -56,13 +56,13 @@ static int max9867_adc_dac_event(struct snd_soc_dapm_wi= dget *w, struct max9867_priv *max9867 =3D snd_soc_component_get_drvdata(component); enum max9867_adc_dac adc_dac; =20 - if (!strcmp(w->name, "ADCL")) + if (!snd_soc_dapm_widget_name_cmp(w, "ADCL")) adc_dac =3D MAX9867_ADC_LEFT; - else if (!strcmp(w->name, "ADCR")) + else if (!snd_soc_dapm_widget_name_cmp(w, "ADCR")) adc_dac =3D MAX9867_ADC_RIGHT; - else if (!strcmp(w->name, "DACL")) + else if (!snd_soc_dapm_widget_name_cmp(w, "DACL")) adc_dac =3D MAX9867_DAC_LEFT; - else if (!strcmp(w->name, "DACR")) + else if (!snd_soc_dapm_widget_name_cmp(w, "DACR")) adc_dac =3D MAX9867_DAC_RIGHT; else return 0; --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 238B6C001E0 for ; Mon, 23 Oct 2023 09:55:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229824AbjJWJzH (ORCPT ); Mon, 23 Oct 2023 05:55:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233380AbjJWJyy (ORCPT ); Mon, 23 Oct 2023 05:54:54 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 385FB10C2 for ; Mon, 23 Oct 2023 02:54:48 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-507b9408c61so4216272e87.0 for ; Mon, 23 Oct 2023 02:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054886; x=1698659686; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mg1xiJ4tpWrc01TGrYLaIzComQYv1hvzEAR610Ntv3U=; b=JvPo8itjnZKIOL3UKj+h26Qsqnz1vIHwnQKAtfZbht61ULhSuht5nI6AGqtZeMKihV +MdVA6scm4aoYbJPRY+ddPNe+Um0dLrSMB2M54HXv5g7zjV9U+UcgemyI/b0dM4Du3sz cV8fFiQ7g0s9UKrkVurikbBmR7/nlOv0sZGbIkwvQ2r1iV0WD8t/ZDbsDCPS7tLqTLxE CVBqJH8DSQQlaTj0Qi93iQxCeu4ElE4i2i0ljbv8NSNNPnf7TbnwG3yYpkjHru5A0eOl jIgxsipz3FiEJR0pzuAMCjo48lahAxBWPWg9kS6BEecVnd/vgxeEEwBGZKzznkSCsNIm EXFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054886; x=1698659686; 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=mg1xiJ4tpWrc01TGrYLaIzComQYv1hvzEAR610Ntv3U=; b=m6H7JkQl4N/R6Z3UCYdR/ErM6gKwsxBVcdmGyhIy92CQxFQg8SK28mjFHlV+PRU/nq 8WENGRY3mTyZajiaezokNoFeklXTeMT9vh3RTez1sHAaPDh8SaGV8REOMbrG/tWknOzu ghMK6kNpOgeQf7Qxhm4CbsokaObKHeBKX7dOuXP+9DDZ+lZCPHNjgzTrwwwTAPsrinwd h0/1mMku0qVMBUO8e/2u9hHDj9yRR+Crqlw6MifFA3R+N6fAONGxuVqcQ+YmXqxa8kEE NSvTiGT/90glk0bBFwXG3oZhAPL2XBDke/xjGBepVbaEb8W1lc5dO0LTyIXWfxKLdEEi eZxg== X-Gm-Message-State: AOJu0YyxYUzxEOHLhbKVW8vpXivcUDjCUzPPf/eZ+ASOvI8Nw8tGUQ5Y AHcl6Xcj81pTsWW6BfKL+Nl8wA== X-Google-Smtp-Source: AGHT+IGVnDVUzhqtZG2Rxtx8SwcXnzeMCoNHkuKGJvqRY3jD0nxvOcWU8+AB175lzXv5OfVrm4BxmA== X-Received: by 2002:ac2:4430:0:b0:500:b7ed:105a with SMTP id w16-20020ac24430000000b00500b7ed105amr6312430lfl.29.1698054886439; Mon, 23 Oct 2023 02:54:46 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:46 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 06/17] ASoC: codecs: rt5682s: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:17 +0200 Message-Id: <20231023095428.166563-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/rt5682s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index 68ac5ea50396..c261c33c4be7 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -1323,9 +1323,9 @@ static int set_i2s_event(struct snd_soc_dapm_widget *= w, if (SND_SOC_DAPM_EVENT_ON(event)) on =3D 1; =20 - if (!strcmp(w->name, "I2S1") && !rt5682s->wclk_enabled) + if (!snd_soc_dapm_widget_name_cmp(w, "I2S1") && !rt5682s->wclk_enabled) rt5682s_set_i2s(rt5682s, RT5682S_AIF1, on); - else if (!strcmp(w->name, "I2S2")) + else if (!snd_soc_dapm_widget_name_cmp(w, "I2S2")) rt5682s_set_i2s(rt5682s, RT5682S_AIF2, on); =20 return 0; --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D3A5C001E0 for ; Mon, 23 Oct 2023 09:55:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233068AbjJWJzR (ORCPT ); Mon, 23 Oct 2023 05:55:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233298AbjJWJy6 (ORCPT ); Mon, 23 Oct 2023 05:54:58 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78E0A10E9 for ; Mon, 23 Oct 2023 02:54:51 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-32db8924201so2094043f8f.1 for ; Mon, 23 Oct 2023 02:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054888; x=1698659688; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ohG7h5MVOd61zy+5ypL65RpxKjVv+oL8L5RUWwJJdI0=; b=zt1WSV923YXZ9jiqUWxltIavwRi0qJrm3ZdsnmiGXDn4g5RzGRzoOKj2FcSIug+3G4 STQT703eYTQCjkO4vkkps4aAlLoMr/BNeRiz2wPmKhhzxXUL5ddUytw72iZlh9wH7nN4 5tiK8DcJGHzNBdNKD42B4jnU5r/J6nLE6cAaKcjnIL08Dvs8P5hQo7rhf5enpmkkt2We F+eQomS9eoHDDxFMgBiRWYHhfdUa/vGg/yWsA2OGsy75n/YlfVGuy8D0sE3EI0jGisSN j6Nb+myzHwdPy6PcSq3Ka/1mYSQiJnO0yjkZecqaQyIcjD0SutQZqjN4LirlWwV8PQkv FTgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054888; x=1698659688; 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=ohG7h5MVOd61zy+5ypL65RpxKjVv+oL8L5RUWwJJdI0=; b=tKpaNAOoUQ6RbwiEfHHNN3DnfvWtYS6J0iTp9LGmjonZROmHo9aArbKFA71RbvJ8aC WxggDf6RpFqhSw3l+3ROp4g1i1/DTEaSU3w5cWc3Ptkg2FEw118OdycLynMnfwAK6vYU bdY9SSdfRzZjxVRKEAzLqwNED8XUsWm1G5agf0BJgv5CmtDIiYmO3JhJtFRF4kNu5TnA HNuLQWr4SmlDb0wNRR1FMjIPUcJ9II/58SGvgiazlrzZzFF4j/2ya03lhWwqKpWnrWhH uaCWzPnUIpC262w/xY+Cz6+HIenA78NG4xTMYzy+Go2PCLoPfIcbGzAoqojbiU8PjPg7 uf7A== X-Gm-Message-State: AOJu0YyYT2103KuMRWGLFotnr06zRvaoSTTZYnFHWQ09MeeqV1MZXpnn V37A+hgmLXy3ILjfBdrRHrsACA== X-Google-Smtp-Source: AGHT+IF2XQ2NytyZKfSuKXcxhn8MgqaftjUTA3vcBEY0OG7GzuniO27qe9jeb7abDdumrFZMKzYUnQ== X-Received: by 2002:adf:fd90:0:b0:32d:8a32:3b2f with SMTP id d16-20020adffd90000000b0032d8a323b2fmr5871452wrr.16.1698054888606; Mon, 23 Oct 2023 02:54:48 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:48 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 07/17] ASoC: codecs: rtq9128: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:18 +0200 Message-Id: <20231023095428.166563-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/rtq9128.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/rtq9128.c b/sound/soc/codecs/rtq9128.c index 371d622c6214..c22b047115cc 100644 --- a/sound/soc/codecs/rtq9128.c +++ b/sound/soc/codecs/rtq9128.c @@ -291,11 +291,11 @@ static int rtq9128_dac_power_event(struct snd_soc_dap= m_widget *w, struct snd_kco =20 dev_dbg(comp->dev, "%s: %s event %d\n", __func__, w->name, event); =20 - if (strcmp(w->name, "DAC1") =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, "DAC1") =3D=3D 0) shift =3D 6; - else if (strcmp(w->name, "DAC2") =3D=3D 0) + else if (snd_soc_dapm_widget_name_cmp(w, "DAC2") =3D=3D 0) shift =3D 4; - else if (strcmp(w->name, "DAC3") =3D=3D 0) + else if (snd_soc_dapm_widget_name_cmp(w, "DAC3") =3D=3D 0) shift =3D 2; else shift =3D 0; --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E1CBC004C0 for ; Mon, 23 Oct 2023 09:55:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233468AbjJWJzX (ORCPT ); Mon, 23 Oct 2023 05:55:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233440AbjJWJy7 (ORCPT ); Mon, 23 Oct 2023 05:54:59 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 096AB10FA for ; Mon, 23 Oct 2023 02:54:52 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-32da9ef390fso2147663f8f.2 for ; Mon, 23 Oct 2023 02:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054891; x=1698659691; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9PvbddIvQlG0l/ZDn5njSVhrq4RgzTBlbX25/MYIgFc=; b=QL3y9JEcLadLoCqVFZ81Hw0SF59gHlxSpxmeZjKjaxcnzAg4Ay57nfed9ds+wXaoCa CXX6nVrSEHDEbQ+2wl7+sJr6ijlxjbdzBPc3uO/aY6qgiAEz1WZfl3cvrbUB3odjeBu/ bDPZrthuoGecsPKU9G3XJlQb5qYtYqBM9Ip+92a4dEV47oezPwEDSQDd197DJbwtKDgB mpQvvoNTDA9tgqC9xbP2AzkdfYMnoplOQqx+ZPqzEUyg8+5VPTw/cDw2tVXHa1piqm8X J3DhZRQu39hKSBi6tVKhOh7XLU7D2Px1CWCP8zBqSbgD5tTbracrkk0pEsDpNGV7Eewn +svQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054891; x=1698659691; 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=9PvbddIvQlG0l/ZDn5njSVhrq4RgzTBlbX25/MYIgFc=; b=tl74xKDrTeKlXuvWnpaJgv7b/mKvo03OKIkNftxXEpnRlRuUGYQs/+aLSz/rqajnV/ NhVRSv9ZJf1FB4Jh9mLBgTch1h1i77QK4kL1YfryFxKKVC0NgNf4nTRlaa3lh6HUKFTo qqa3GsRUr7PZg8KTS70edrKNNg4FIN+AbdfiX0mT2O4WocKo05GjHuAUC+vp8hphJJ5e +/rCsgOa4Z8h5/VL9LEi0cVcJG/4AnylNA/N0wk23V22vHdwQ8MOEUEPUjVeQI+qAdNV cYHmUowKdjUf7J9nJWiaWYtecoBqI5bEVTvNZluF4M8zJiNklpc96aD9G22jmhd9KumE ys7w== X-Gm-Message-State: AOJu0YxX4ku0hClhQzcAZEXphT1GZmPXb2C3naq8cECFAbOlr2TvyOHj IIxR7F7aus+QXXvpOYHhy0Sdog== X-Google-Smtp-Source: AGHT+IEmmCcXMvV2AiWhQpKHX0IqP6/STlrOm+onc5uiN24/C1EAIXqoQxx+Ad9L+iK6N0Yq3GEInA== X-Received: by 2002:a5d:5709:0:b0:32d:9fd1:91f9 with SMTP id a9-20020a5d5709000000b0032d9fd191f9mr5739165wrv.60.1698054890848; Mon, 23 Oct 2023 02:54:50 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:50 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 08/17] ASoC: codecs: wcd9335: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:19 +0200 Message-Id: <20231023095428.166563-9-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wcd9335.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index a05b553e6472..43c648efd0d9 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -3296,31 +3296,31 @@ static int wcd9335_codec_enable_interpolator(struct= snd_soc_dapm_widget *w, int val; int offset_val =3D 0; =20 - if (!(strcmp(w->name, "RX INT0 INTERP"))) { + if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT0 INTERP"))) { reg =3D WCD9335_CDC_RX0_RX_PATH_CTL; gain_reg =3D WCD9335_CDC_RX0_RX_VOL_CTL; - } else if (!(strcmp(w->name, "RX INT1 INTERP"))) { + } else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT1 INTERP"))) { reg =3D WCD9335_CDC_RX1_RX_PATH_CTL; gain_reg =3D WCD9335_CDC_RX1_RX_VOL_CTL; - } else if (!(strcmp(w->name, "RX INT2 INTERP"))) { + } else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT2 INTERP"))) { reg =3D WCD9335_CDC_RX2_RX_PATH_CTL; gain_reg =3D WCD9335_CDC_RX2_RX_VOL_CTL; - } else if (!(strcmp(w->name, "RX INT3 INTERP"))) { + } else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT3 INTERP"))) { reg =3D WCD9335_CDC_RX3_RX_PATH_CTL; gain_reg =3D WCD9335_CDC_RX3_RX_VOL_CTL; - } else if (!(strcmp(w->name, "RX INT4 INTERP"))) { + } else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT4 INTERP"))) { reg =3D WCD9335_CDC_RX4_RX_PATH_CTL; gain_reg =3D WCD9335_CDC_RX4_RX_VOL_CTL; - } else if (!(strcmp(w->name, "RX INT5 INTERP"))) { + } else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT5 INTERP"))) { reg =3D WCD9335_CDC_RX5_RX_PATH_CTL; gain_reg =3D WCD9335_CDC_RX5_RX_VOL_CTL; - } else if (!(strcmp(w->name, "RX INT6 INTERP"))) { + } else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT6 INTERP"))) { reg =3D WCD9335_CDC_RX6_RX_PATH_CTL; gain_reg =3D WCD9335_CDC_RX6_RX_VOL_CTL; - } else if (!(strcmp(w->name, "RX INT7 INTERP"))) { + } else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT7 INTERP"))) { reg =3D WCD9335_CDC_RX7_RX_PATH_CTL; gain_reg =3D WCD9335_CDC_RX7_RX_VOL_CTL; - } else if (!(strcmp(w->name, "RX INT8 INTERP"))) { + } else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT8 INTERP"))) { reg =3D WCD9335_CDC_RX8_RX_PATH_CTL; gain_reg =3D WCD9335_CDC_RX8_RX_VOL_CTL; } else { --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C0FEC25B41 for ; Mon, 23 Oct 2023 09:55:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233487AbjJWJza (ORCPT ); Mon, 23 Oct 2023 05:55:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233480AbjJWJzN (ORCPT ); Mon, 23 Oct 2023 05:55:13 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDB271718 for ; Mon, 23 Oct 2023 02:54:55 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-32dbbf3c782so2378926f8f.1 for ; Mon, 23 Oct 2023 02:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054893; x=1698659693; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iygGW2h2lVMWeGfG3UfW0SGTTyTrk1COvj9PMOD/Pf4=; b=qUpXN0ILCi4LvFMINMaTf56b3r6pxUi8xiIVFHn6NjdTchBM/L0hxdfp9ZgbPsOMEr bMQqww3Arug8O47iA5c00G777hjoX4vSly49WoLvATe6qW+JqpPE8aVsZ/HHLRGfYD9D STpDO1D13bAeZT5UgJVBKhZ21o0jBxbXp0bZ19pEbhlDM+cwkmTHRg2JBotvzNQMqEqf FBR7EqDniDJw19/OoWcQvddq/qNS+u2nqdZyfu6FYblWgKHhj+6HL/KrpjzyWXVGB3pg dxFXOt1wFhm+sOqi234SpH0ek6MIAods1pffV4sRpi0SQILgnVoDiPa1kvzcpmY6ayar vWXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054893; x=1698659693; 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=iygGW2h2lVMWeGfG3UfW0SGTTyTrk1COvj9PMOD/Pf4=; b=dn1NrKcF0wiK55x2PCXqjXwMwm/Z4cxRu3a+4v3QO/sBUS1WQi8SMtTGOQjazyUkWg dmdkT3N6c2PixzbFP5OM8yoaEoT9e9rMOg93VOB/Yl/WJPPSnE93c6bI5xXhBU4lpP80 EDpSSAX9uFXbth0NBNKVoa53TDMtQLmT0H45g1XcLnb703yqDeZfaEFRiuOYLw5b8sd2 X2ze9r2kAaY+aNUqW4i4uC9igj6T96jcA59di52P/gGOWghmtJarZcBQFD4IDTYqBW6T tpMEuDqInBNIb07AGIGDhDq1VUKntmbWwZ8NikGHsTBGJW0azYnYbgO7XR8G+16h8RWc Mqsg== X-Gm-Message-State: AOJu0Yz13fGtW1GUPIOmsulYd0PS026ijKgFhaYSGzRocunGnGMTfmN9 URrjMg+MF+HcHMuu/HqwEO0KlQ== X-Google-Smtp-Source: AGHT+IHTc2UW0PcRRtRg3EJmwXBDKZ0rRGICIe4tZ3tRk+SG6RlHUvnvHSIX5664+drOKrq+nZy8rg== X-Received: by 2002:a05:6000:92c:b0:32d:81f9:7712 with SMTP id cx12-20020a056000092c00b0032d81f97712mr8264026wrb.20.1698054893380; Mon, 23 Oct 2023 02:54:53 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:53 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 09/17] ASoC: codecs: wm8962: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:20 +0200 Message-Id: <20231023095428.166563-10-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Acked-by: Charles Keepax --- sound/soc/codecs/wm8962.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 83ce5dbecc45..fb90ae6a8a34 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1854,10 +1854,10 @@ static int tp_event(struct snd_soc_dapm_widget *w, =20 reg =3D WM8962_ADDITIONAL_CONTROL_4; =20 - if (!strcmp(w->name, "TEMP_HP")) { + if (!snd_soc_dapm_widget_name_cmp(w, "TEMP_HP")) { mask =3D WM8962_TEMP_ENA_HP_MASK; val =3D WM8962_TEMP_ENA_HP; - } else if (!strcmp(w->name, "TEMP_SPK")) { + } else if (!snd_soc_dapm_widget_name_cmp(w, "TEMP_SPK")) { mask =3D WM8962_TEMP_ENA_SPK_MASK; val =3D WM8962_TEMP_ENA_SPK; } else { --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFCF3C25B41 for ; Mon, 23 Oct 2023 09:55:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233429AbjJWJzj (ORCPT ); Mon, 23 Oct 2023 05:55:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233501AbjJWJzO (ORCPT ); Mon, 23 Oct 2023 05:55:14 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE4A8E6 for ; Mon, 23 Oct 2023 02:54:57 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-32d9b507b00so2282584f8f.1 for ; Mon, 23 Oct 2023 02:54:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054896; x=1698659696; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SkUvzAZAFAxBUpUecaFOI7DumC3gwDv4zZE7XoEdjuk=; b=Q5ynP456sBY9q+s7u+xqYUeiMrakgZWEFKXvM/6j0781R3HNLoi+WmlKpMl9HYJctk rwmIAwP6yyFP+kNIM1vBq+GU3OyGWfCo6awqI2QqhTeZkQ5rgPXOU+g/JYgpb4BZrDLn A5R5iP/Z9MsP6UAwbIYUVn1po8KWIV3BuJLuOqAOqbgnZ3Uz7oiFXDbyYN6cqxY3isVz Ujn5N8YT6tn21ESFS02QF+DMLWZVVEv4GVV+6XMicb36R40AcmImX8xHj0NjN4LhYj+e P6e4FyyESqMChd4d7+BzSPV4EWrWz8faUDjLXsjUK3wOGXKaDDP9V5519sVmBiwVfd1/ KI6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054896; x=1698659696; 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=SkUvzAZAFAxBUpUecaFOI7DumC3gwDv4zZE7XoEdjuk=; b=tcxskQtjtWpKXzU92cwi9vnQCLU/wRyt7IurLXMGmA0y5xdDRVtvLpIgbYX86Ge30P T8rz6T7wpzmD6+XNBo/KcEf+9ey3VJ15q42exb7pc1rudvlAoMhTVUUFg8AFnB1HGplu 1gS/v3fA391Y2uQHAZH1lnr5fUFqoYGi7IfOtqOYNhZWGgM5fgzv5r8CM8/LWV1UeRlo lAtAP6pAnIKnmILIBlfJSza94h/8xoFan0AFhKTeJw/dZFntdKC7/1xr0raTASr/fbWY zzy8BKSPa1xchgec0qjhJnAPGBG+UMOVnHZ/Sl7LQewUxwr/5qTbyc5Zi2/16tGJMHBL 3WNA== X-Gm-Message-State: AOJu0Yw8jA+8o/B3u9uHyFUItoyUxgmUf10Qz2YgCvkYGWDCTtZFriBB N/kh+quiT+VpaJ3SEon+ch0jtA== X-Google-Smtp-Source: AGHT+IHWg8SLe3xjPrj28tLTDiymcbd03RUAChA7SD3rg/2FeMGUhVv6IRTOZLXoX6FA5TVWxviBfw== X-Received: by 2002:a5d:6804:0:b0:32d:8907:4528 with SMTP id w4-20020a5d6804000000b0032d89074528mr5681524wru.28.1698054895793; Mon, 23 Oct 2023 02:54:55 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:55 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 10/17] ASoC: codecs: wm8994: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:21 +0200 Message-Id: <20231023095428.166563-11-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Acked-by: Charles Keepax --- sound/soc/codecs/wm8994.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index a48e904a9740..fc9894975a1d 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -262,7 +262,7 @@ static int check_clk_sys(struct snd_soc_dapm_widget *so= urce, else clk =3D "AIF1CLK"; =20 - return strcmp(source->name, clk) =3D=3D 0; + return snd_soc_dapm_widget_name_cmp(source, clk) =3D=3D 0; } =20 static const char *sidetone_hpf_text[] =3D { --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F777CDB474 for ; Mon, 23 Oct 2023 09:55:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233656AbjJWJzr (ORCPT ); Mon, 23 Oct 2023 05:55:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233530AbjJWJzR (ORCPT ); Mon, 23 Oct 2023 05:55:17 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AC4F10D4 for ; Mon, 23 Oct 2023 02:54:59 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-32dff202b4bso382839f8f.1 for ; Mon, 23 Oct 2023 02:54:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054898; x=1698659698; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sOdWx51KZzcP4yPFkM05Libt2LPoTXL1hZ7dHc5xIDc=; b=VRzOtaijk3DPunlXmfnUUth0w3V9fJXXzPGCYioqENLagtGO2m808WvkrBqH1MON8S ZsZS/UEHkNtc4dogJGbwcUCKJ3EvBizW7pWxR2ukNm+Vyg+xSuqHMDm3RJTcHJP4r/Cm l/LFCw468LzBoRHcEWKp/V2r3gxtzTF1X5uCMeiR5rCLvgYglQB7+Ikps3mApyrgcgVW +Lbr8MvTawuo8MOJdqv0L5sy7DKAVHr6B7HXolgDXLpHmplMRb6Jm4Lgl+TyJIkFvd/H LUv+J4toQEq9z9fwm0pDecdB1xzbQUucDR1YaHRqAa6PWl3p4G8l3X1MAPESHWA9fHQi BNyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054898; x=1698659698; 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=sOdWx51KZzcP4yPFkM05Libt2LPoTXL1hZ7dHc5xIDc=; b=WCzfe/N6VJoE9Lb72KYVI13FptNpqfVJAq3AlR6ZqqNNckT+m+aZ2BCCwHYN1SaOgY K6d9hid0otTUEG61lMzjr2qAQV9K79Nchcrr1SFPXrgoZozl7G9WR+63Q4yAcGa62PwH czVPGlXNnH8tciBiszYz2gGlKxo61RjvK7i/mpoQdV2RlTu26QSqMamccsyBmWxZAlyW KqKebm6VQMwVPVW+/nzWa/rq4giLv4CZDs9Y7jPkZOVPjS1H6DZ5vQ6mI56y8yxD9FnB YHqLonUGD6yLjWG2vqIUjj1WB8paWHFtk91uks2C3J1ZnN4irECLbuW6n+gzlMqqzpHh HUKQ== X-Gm-Message-State: AOJu0Yya2+VhLCrvX98ThnO0GoPNnDuufE5TdBuLbSMx7idG1Ah50+Cj LupHqwTiUIe5qAM/OqVdcMk4tg== X-Google-Smtp-Source: AGHT+IHEVLDPnEUrrX/PY+GOmXCghoQi2Q5x3tEYdDkzUdmjkSVDumB20aWrVD4RN64ThYu9YeLKpg== X-Received: by 2002:a5d:6941:0:b0:32d:a022:855a with SMTP id r1-20020a5d6941000000b0032da022855amr5924003wrw.20.1698054898321; Mon, 23 Oct 2023 02:54:58 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:57 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 11/17] ASoC: codecs: wm8995: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:22 +0200 Message-Id: <20231023095428.166563-12-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Acked-by: Charles Keepax --- sound/soc/codecs/wm8995.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 4ffa1896faab..59ef2ef8ce00 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -541,7 +541,7 @@ static int check_clk_sys(struct snd_soc_dapm_widget *so= urce, clk =3D "AIF2CLK"; else clk =3D "AIF1CLK"; - return !strcmp(source->name, clk); + return !snd_soc_dapm_widget_name_cmp(source, clk); } =20 static int wm8995_put_class_w(struct snd_kcontrol *kcontrol, --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27265CDB474 for ; Mon, 23 Oct 2023 09:55:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233567AbjJWJzy (ORCPT ); Mon, 23 Oct 2023 05:55:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233440AbjJWJzY (ORCPT ); Mon, 23 Oct 2023 05:55:24 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9135B198B for ; Mon, 23 Oct 2023 02:55:03 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4079ed65471so25599835e9.1 for ; Mon, 23 Oct 2023 02:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054900; x=1698659700; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XaRWK1PxbLteLkMq7b8+dA2nXiGKOdN1dmpy3IbpNyI=; b=wXssIZoauGB6M2qlDlJhB69IjUmIc/XOS4aYwd7XQ5/F4MpUB5iwpRF9v+p6mQ+8Us 3ZJdsbFOcAEcpgh4T99TWtNNAT/lZ+rs2giHj+RjEPB2eC0huJTs6h8Ckt/W0HJl0W4k u4yN8Y24abJvP3CKKnbukKnz/ZCgl9xcg4++G0cGVYAwkHPcmRQ9vFLHBAnsVX75O8qC 8fH9HygF4gyZpDC7cJojdbCFiW+HGrF8ecC4nRLTxhJo+S/KofR6mu7etVPifYbRhodT j10XCe0wMwdCs/kG6k0NdLOcTgG+IG9adi2x+0IP7ZXZXYFMSc76ay3se3rHc+t9wn2I swjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054900; x=1698659700; 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=XaRWK1PxbLteLkMq7b8+dA2nXiGKOdN1dmpy3IbpNyI=; b=W6WNCZJgu2iRDZCDpnxXa6faxHWsU/ZdU9q+Qx0EK6ML+O6xiOTsnqKtwJpA6m6CRC g/k7HneceeB15iTc57ERx6y0wsrmeJZYRXcsUqOUKJYgYL4QUivVTocInJCQ5PtpO2Jo Uhiers65cqeOoKittf2puabDGG6+AIDKN/MLGOOjeC0rwQxyoo4NqDUXCps1xHxa8YOS CVt7gTkMoaTisXmzBJHgd4DFL4P5ceVOAQTraK7VzUmj4LyU6NEhctrOSeTaacHmGmph cm5QDYTKiTbHOucmkJpEIZ1UjzoQkOH69/qm3Bc2MZlmJy2HZFXsGStP3/NrohpLJJGJ tuOg== X-Gm-Message-State: AOJu0YzCV3OoN/enUoaEGPP8CfyU3opXH7lLSF6SVw98nZbxCTEyMppw Q/y+KbD+PCQkJha9hhUCEn4oSA== X-Google-Smtp-Source: AGHT+IGcRnlB4vFMFDgducXrQmS80dOVHAS+aDCp1wKs33+friJEQiADUVo77kFzrMbe1bXLDVGcYA== X-Received: by 2002:adf:fe48:0:b0:323:15d7:900e with SMTP id m8-20020adffe48000000b0032315d7900emr5319691wrs.53.1698054900441; Mon, 23 Oct 2023 02:55:00 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:55:00 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 12/17] ASoC: mediatek: mt8183: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:23 +0200 Message-Id: <20231023095428.166563-13-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8183/mt8183-dai-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-dai-i2s.c b/sound/soc/mediate= k/mt8183/mt8183-dai-i2s.c index 8645ab686970..65e46ebe7be6 100644 --- a/sound/soc/mediatek/mt8183/mt8183-dai-i2s.c +++ b/sound/soc/mediatek/mt8183/mt8183-dai-i2s.c @@ -276,13 +276,13 @@ static int mtk_apll_event(struct snd_soc_dapm_widget = *w, =20 switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, APLL1_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) =3D=3D 0) mt8183_apll1_enable(afe); else mt8183_apll2_enable(afe); break; case SND_SOC_DAPM_POST_PMD: - if (strcmp(w->name, APLL1_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) =3D=3D 0) mt8183_apll1_disable(afe); else mt8183_apll2_disable(afe); --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98CC3C00A8F for ; Mon, 23 Oct 2023 09:55:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233446AbjJWJz6 (ORCPT ); Mon, 23 Oct 2023 05:55:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233581AbjJWJzZ (ORCPT ); Mon, 23 Oct 2023 05:55:25 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7E7F199B for ; Mon, 23 Oct 2023 02:55:04 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-507c91582fdso4518742e87.2 for ; Mon, 23 Oct 2023 02:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054902; x=1698659702; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sijvR+hKjJi+AfXfyjsruHtUHe1YLoATqzDljEq9PNo=; b=fOHIyn96SAslkpwLxZEuEGRU1rnhf6L7DyhsmslymgS+8I8s7wLHtRqDnBfVat1yCX OcJXZq7v6qYI7Af9J6A6sHmhmthXDdkddxxApb8uLOvxaC18kCzfXg8iNO2YSy47drCh 96Kcutur89DOJHfRr8Ro5IB0yL5p9bU+YxxnHQFO0kNCAPOrpx9bFQOXcjM4GU/SEK9h gdt4fxTs9OFGN+gJwAF5MTWdfG/013zTDc80/XHpKIX8DR7ik93i/2Nrn8q35R52yrg6 aUhlKz5rgaXdP7U24Orc7vboK8ya4lFcm1qsJrd81oi1wcf0+NC4i9HVgKcLy8hS/ppu Xr5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054902; x=1698659702; 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=sijvR+hKjJi+AfXfyjsruHtUHe1YLoATqzDljEq9PNo=; b=uSlA2T3DPdo7DIKJp7M4+txP/XqPN6dm96YHMZVWL7rwNfRLQiLNSiVvdWfF/KkWt2 66kyyBNzagEZQUq4bvTJAGxVGoBjSvnMft8W7+/nm8Hc0SmjgkdpUEVTYMjcUyKeuMVd XH96mFzH8fYn2PZ/ZGLde1QbGBSIe3xw78DLlstx2Io690gMp+xR80eoD3twCOEvLVL6 JYR9ER5KGHb60IIt+I4h1xUMDQJVJQZCaiZLBrHv/HIrAuWyIfoC5lNbBrv9ndHubZzB bT/6G1qg5V8fbNYqAuz9DKTFutURZ/PZAvRO2Bjr2jVYAyZc1ocVFRxlT9RJii8vctuy 6IwQ== X-Gm-Message-State: AOJu0YzsalBOHBPCIEvPhf4fzqLTt1ieOU19ne24GEgfdDpYkrkMLNFb 8IyDZqQ4SvUes/70U5ZYUwH/aA== X-Google-Smtp-Source: AGHT+IF54Qe6n/zvNqpT0Lxz4KVrjRL1LPUYGQ1mvRY5NOKen/Ok/2JBtT1ZFsNaf/o7AVD7jqRWnw== X-Received: by 2002:a2e:a792:0:b0:2bf:e9e8:de23 with SMTP id c18-20020a2ea792000000b002bfe9e8de23mr7862726ljf.16.1698054902708; Mon, 23 Oct 2023 02:55:02 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.55.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:55:02 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 13/17] ASoC: mediatek: mt8186: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:24 +0200 Message-Id: <20231023095428.166563-14-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Reviewed-by: AngeloGioacchino Del Regno Tested-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 2 +- sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c | 2 +- sound/soc/mediatek/mt8186/mt8186-dai-i2s.c | 4 ++-- sound/soc/mediatek/mt8186/mt8186-dai-src.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c b/sound/soc/mediat= ek/mt8186/mt8186-dai-adda.c index 247ab8df941f..85ae3f76d951 100644 --- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c +++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c @@ -321,7 +321,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dap= m_widget *w, MTKAIF_RXIF_CLKINV_ADC_MASK_SFT, BIT(MTKAIF_RXIF_CLKINV_ADC_SFT)); =20 - if (strcmp(w->name, "ADDA_MTKAIF_CFG") =3D=3D 0) { + if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") =3D=3D 0) { if (afe_priv->mtkaif_chosen_phase[0] < 0 && afe_priv->mtkaif_chosen_phase[1] < 0) { dev_err(afe->dev, diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c b/sound/soc/med= iatek/mt8186/mt8186-dai-hw-gain.c index 33edd6cbde12..75cb30790b1b 100644 --- a/sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c +++ b/sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c @@ -47,7 +47,7 @@ static int mtk_hw_gain_event(struct snd_soc_dapm_widget *= w, =20 switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, HW_GAIN_1_EN_W_NAME) =3D=3D 0) { + if (snd_soc_dapm_widget_name_cmp(w, HW_GAIN_1_EN_W_NAME) =3D=3D 0) { gain_cur =3D AFE_GAIN1_CUR; gain_con1 =3D AFE_GAIN1_CON1; } else { diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c b/sound/soc/mediate= k/mt8186/mt8186-dai-i2s.c index f07181be4370..7c4021221950 100644 --- a/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c +++ b/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c @@ -393,13 +393,13 @@ static int mtk_apll_event(struct snd_soc_dapm_widget = *w, =20 switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, APLL1_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) =3D=3D 0) mt8186_apll1_enable(afe); else mt8186_apll2_enable(afe); break; case SND_SOC_DAPM_POST_PMD: - if (strcmp(w->name, APLL1_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) =3D=3D 0) mt8186_apll1_disable(afe); else mt8186_apll2_disable(afe); diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-src.c b/sound/soc/mediate= k/mt8186/mt8186-dai-src.c index 67989ffd67ca..e475f4591aef 100644 --- a/sound/soc/mediatek/mt8186/mt8186-dai-src.c +++ b/sound/soc/mediatek/mt8186/mt8186-dai-src.c @@ -322,7 +322,7 @@ static int mtk_hw_src_event(struct snd_soc_dapm_widget = *w, struct mtk_afe_src_priv *src_priv; unsigned int reg; =20 - if (strcmp(w->name, HW_SRC_1_EN_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) =3D=3D 0) id =3D MT8186_DAI_SRC_1; else id =3D MT8186_DAI_SRC_2; @@ -487,7 +487,7 @@ static int mtk_afe_src_en_connect(struct snd_soc_dapm_w= idget *source, struct mt8186_afe_private *afe_priv =3D afe->platform_priv; struct mtk_afe_src_priv *src_priv; =20 - if (strcmp(w->name, HW_SRC_1_EN_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) =3D=3D 0) src_priv =3D afe_priv->dai_priv[MT8186_DAI_SRC_1]; else src_priv =3D afe_priv->dai_priv[MT8186_DAI_SRC_2]; --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2ED32C25B45 for ; Mon, 23 Oct 2023 09:56:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233490AbjJWJ4J (ORCPT ); Mon, 23 Oct 2023 05:56:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233476AbjJWJz0 (ORCPT ); Mon, 23 Oct 2023 05:55:26 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC05119A9 for ; Mon, 23 Oct 2023 02:55:06 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32da7ac5c4fso2149105f8f.1 for ; Mon, 23 Oct 2023 02:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054905; x=1698659705; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Uu/sTtccUwF0ah9E+SK4dukpMAzlv54jZyNo0CSiF0c=; b=UP0pQimVCO/Olvg/XVQwTCUP910mxq9CLnCLR6jJECqgs+p+4GvDlE02eQVnksCGUN /DT6DtAWOHeeEtU2StWC/7nGojTqkoeFNDZwJ1iPpkX5wKLOxt142JhCXOXH7eiXUI7q NcDPZXsyX2HBCpLsvEZtlsd4p6CaobOm/VQYPkUtz+sOtP5wH5qzQbvsBI/UUkCdtKRC 7HQcZprlXhozZBzmkhnDULobcUTiE1ZySfnzcrWXub9NexaGI0J0plt6/0FJbo9hUaZy T5D+K3piClH3scjE8CekXADoo2cWWbZcgADcIpq64UYaeKKHfvkX/fmlWyClfNX/cmVA mKYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054905; x=1698659705; 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=Uu/sTtccUwF0ah9E+SK4dukpMAzlv54jZyNo0CSiF0c=; b=CBx0Y21ivEEVZJoKdTSIdCY5xxJiyzD6nBzDDJBYhvln7jhguftyCKiJ2Hzfh+vqzr AEs56MS1SeegyW1GP973ZW8b+0pNj/Unoj3HIt3pPjLKRYQIc+W58Kh8ZE0rTGZV1zTO yGvrHNeemFchA/+YCrlj91EmU4YkE3mIDvCUFJYt/O9UeFiCz3SdI+dsaTdWW/uU++Qs nMHxNidTSMt2zRiLntH9PMxKhRrh5F45XYIKc+rgVtcywnxLEAcH28x8jlK1ibrnWmwo L56JNMCEM8O+/0NlKT/PJ2rKq1snE1rDs/zUJ7LI/giTfpmnK8yRPWGjQcQeK6wPvebx LJ/Q== X-Gm-Message-State: AOJu0Yxd7wNXLUYgwLGiCrLeMppxzV7uMH9nZy4DVNmdY1DPfBHLxZ57 q9jhHBBmrkB3SMbni4pyaWcU0Q== X-Google-Smtp-Source: AGHT+IFC/yAsny5qrYVg+EkJz4fUi483BdHJQWDTMZauGOFIlXds5DqFSdeJFZSj0XyhBOmMbTRyIg== X-Received: by 2002:a5d:5267:0:b0:31f:f65f:74ac with SMTP id l7-20020a5d5267000000b0031ff65f74acmr7213785wrc.70.1698054905019; Mon, 23 Oct 2023 02:55:05 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:55:04 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 14/17] ASoC: mediatek: mt8188: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:25 +0200 Message-Id: <20231023095428.166563-15-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Trevor Wu --- sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8188/mt8188-dai-etdm.c b/sound/soc/mediat= ek/mt8188/mt8188-dai-etdm.c index 16440dd0a89c..2a48f5fd6826 100644 --- a/sound/soc/mediatek/mt8188/mt8188-dai-etdm.c +++ b/sound/soc/mediatek/mt8188/mt8188-dai-etdm.c @@ -576,13 +576,13 @@ static int mtk_apll_event(struct snd_soc_dapm_widget = *w, =20 switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, APLL1_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) =3D=3D 0) mt8188_apll1_enable(afe); else mt8188_apll2_enable(afe); break; case SND_SOC_DAPM_POST_PMD: - if (strcmp(w->name, APLL1_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) =3D=3D 0) mt8188_apll1_disable(afe); else mt8188_apll2_disable(afe); --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CB8EC001E0 for ; Mon, 23 Oct 2023 09:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233637AbjJWJ4R (ORCPT ); Mon, 23 Oct 2023 05:56:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233509AbjJWJzj (ORCPT ); Mon, 23 Oct 2023 05:55:39 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64E7E19B9 for ; Mon, 23 Oct 2023 02:55:09 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-32d9effe314so2170999f8f.3 for ; Mon, 23 Oct 2023 02:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054907; x=1698659707; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L7AsNVigM8lbJ2TEkTHkh3DJVAWVStJtaNwYVukOeww=; b=DuW7m69MJUZyDMMaLEHKeDXQ6wD+G61sC8fZ16YyymVEqlNXVe7AnBKFDSmXP3XCKH JRnr9kpslZm7Gf3TeA98V+nyedTM85hSGzi9FGY/m21Sr0YhyOgCZReGf8p61anwclUI qG8i/WBSKvflG3tTFFfL+cF+y0z5ZOsvrSdJiLTNXfvqy4p8Uf3f4ds0lx4CE4RdddSy Dp9CisqOqmN5feVp6vZiQ7dIDLiNt89GWe2mJ/8XnnExPhPoRcjfCaQekjALMW8ImDii sos2+sb4/AvUpJkJE7YmjSKT6puWXianmfGI2yHny1CeWfsWEEAcJjR1keoI4T7D1mF/ Gpfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054907; x=1698659707; 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=L7AsNVigM8lbJ2TEkTHkh3DJVAWVStJtaNwYVukOeww=; b=A7hfbGrvj7rhTqonrAOYhRUA08zOFl2XlvkKSHdCPuURNqJBmE2pPpqI9Dtl/E7vt7 hOmyc1VzKYSTd88uXTNOz1iMRwqURtGkP6YHpu9LhrDxiSEJqfrPJtvzg+k1AqWiVY3F s3LC5YNlRG1ixKqXEpb8cPKhnlUauQmjSqrW9SbDgmEwA4cXerpYnV1DSIpveF0kHWHs e6T76G/gKOUBbwnGwriWMa0iLkREJh1qh9HiuLcJWrkhq7yU/Y14EKd7btEDYjYtRghq DWioGp8m4dCw732ESr2aahudqQWsRtlQmHxl9WpvyNvLh9qmKvhCrJT3Kmtdx02tal4i 5rjw== X-Gm-Message-State: AOJu0YzrYbBK6sE3Uhb2f+XPLy31WVWrZqVMjNXen0ku4CIrhKBmrTFi gIan2LKO4k7wpMafrgoFqT5CXg== X-Google-Smtp-Source: AGHT+IG0DaJTatBkYQl759RhB3DEXbNMmxDZLlPU/SGS2hOJRk1TRuMc/RVGopj7Uuqttkf+UNyBLw== X-Received: by 2002:adf:cf11:0:b0:32d:967d:1baf with SMTP id o17-20020adfcf11000000b0032d967d1bafmr5476727wrj.1.1698054907228; Mon, 23 Oct 2023 02:55:07 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:55:06 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 15/17] ASoC: mediatek: mt8192: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:26 +0200 Message-Id: <20231023095428.166563-16-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski Reviewed-by: AngeloGioacchino Del Regno Tested-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 4 ++-- sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c b/sound/soc/mediat= ek/mt8192/mt8192-dai-adda.c index 4919535e2759..36d33032a37a 100644 --- a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c +++ b/sound/soc/mediatek/mt8192/mt8192-dai-adda.c @@ -435,7 +435,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dap= m_widget *w, regmap_write(afe->regmap, AFE_ADDA6_MTKAIF_CFG0, 0x00010000); =20 - if (strcmp(w->name, "ADDA_MTKAIF_CFG") =3D=3D 0 && + if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") =3D=3D 0 && (afe_priv->mtkaif_chosen_phase[0] < 0 || afe_priv->mtkaif_chosen_phase[1] < 0)) { dev_warn(afe->dev, @@ -444,7 +444,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dap= m_widget *w, afe_priv->mtkaif_chosen_phase[0], afe_priv->mtkaif_chosen_phase[1]); break; - } else if (strcmp(w->name, "ADDA6_MTKAIF_CFG") =3D=3D 0 && + } else if (snd_soc_dapm_widget_name_cmp(w, "ADDA6_MTKAIF_CFG") =3D=3D 0= && afe_priv->mtkaif_chosen_phase[2] < 0) { dev_warn(afe->dev, "%s(), mtkaif_chosen_phase[2]:%d\n", diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c b/sound/soc/mediate= k/mt8192/mt8192-dai-i2s.c index ea516d63d94d..47dc7ec4cae7 100644 --- a/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c +++ b/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c @@ -623,13 +623,13 @@ static int mtk_apll_event(struct snd_soc_dapm_widget = *w, =20 switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, APLL1_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) =3D=3D 0) mt8192_apll1_enable(afe); else mt8192_apll2_enable(afe); break; case SND_SOC_DAPM_POST_PMD: - if (strcmp(w->name, APLL1_W_NAME) =3D=3D 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) =3D=3D 0) mt8192_apll1_disable(afe); else mt8192_apll2_disable(afe); --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2652C00A8F for ; Mon, 23 Oct 2023 09:56:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233650AbjJWJ4Y (ORCPT ); Mon, 23 Oct 2023 05:56:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233541AbjJWJzp (ORCPT ); Mon, 23 Oct 2023 05:55:45 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BA5E10E0 for ; Mon, 23 Oct 2023 02:55:11 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-32d80ae19f8so2244616f8f.2 for ; Mon, 23 Oct 2023 02:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054909; x=1698659709; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZC07USduWdC7NjdC5xCXcdF31ciW6Iy95zkt28zTytw=; b=IN9BBhY7AWsLmw5OWUzNi5QkJLX2pyzZDlr74xE9tChaAGxlE7hjwrsarVit6d2C5v +shlywCH/K/yFZmM0xN7KP+JhjcZN1PNP2Udv9fls3v2SwqdvbKDm58/Zfx727w6aWTi QRAFJ6Am287XLXbVwP8nfU/uFN8lV+4evO+x9p+3QNOh262mA/V/ZnA/VEUYRhUviQSL w4DtwGvsMKWgbwIot69DhRstafI0U43TqVAbhvqCUpqiXSHu+kzi2VI4AhZkDGKYPVGY uA7QeSGDMiBOQSLfG3W60im/6ev0Uv8cW9evATrEOi+SUbZZfyNV7KNnUDXER3B9LgiS RCSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054909; x=1698659709; 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=ZC07USduWdC7NjdC5xCXcdF31ciW6Iy95zkt28zTytw=; b=NSogIkM+6LJrqq9EELD/dDnCAOL4wE6YIRj8+xlcvJaTUjmTm6IGvhRMdzgkSDZCzA h6bVmNiflDSqi/X9kKbpI+HQJSABpsa+jXxwg2ffCnmuq5O7o3BvcGHtZt8+M6I1ayXv wGqkBq/mbxa+VIKDy0V/owcGU9oEV9TSAxsKcgDNVaWOv82yLmKY2LZbXewHr105Xpa2 N5wdh0AL0qVJ5Eb6zSQ2U4okspb43D31Hb4+uqFIUT4zqRkMpPuBH2x/Nd74SwdBOmEX a9uCrUnb8Dv+otT37i9ZRk+hr1IoRFC7WVuDvKl2ErKByakaD3lOtDT4l6SwcLR5lf9C SoJw== X-Gm-Message-State: AOJu0YzeVgh2wjLJ+WwwngXQ9A27w2IDkjdzGiXV1toHokbWbOjLculI 2V1bwxoQ0bYRA2Olaws8nc3xMMszf3R3JRTDUpI= X-Google-Smtp-Source: AGHT+IEj7uxeA3nMNUo9sdq2wgfqK3o3A7RdYb9gMk09HGqmRvuI7EP8mG67nJpViU+BpTyEwFeWzQ== X-Received: by 2002:adf:e80a:0:b0:32d:8c6d:cda4 with SMTP id o10-20020adfe80a000000b0032d8c6dcda4mr6419354wrm.43.1698054909354; Mon, 23 Oct 2023 02:55:09 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:55:08 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 16/17] ASoC: samsung: speyside: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:27 +0200 Message-Id: <20231023095428.166563-17-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski --- sound/soc/samsung/speyside.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 43519572dc69..79476e8eb680 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -111,9 +111,9 @@ static int speyside_jack_polarity; static int speyside_get_micbias(struct snd_soc_dapm_widget *source, struct snd_soc_dapm_widget *sink) { - if (speyside_jack_polarity && (strcmp(source->name, "MICB1") =3D=3D 0)) + if (speyside_jack_polarity && (snd_soc_dapm_widget_name_cmp(source, "MICB= 1") =3D=3D 0)) return 1; - if (!speyside_jack_polarity && (strcmp(source->name, "MICB2") =3D=3D 0)) + if (!speyside_jack_polarity && (snd_soc_dapm_widget_name_cmp(source, "MIC= B2") =3D=3D 0)) return 1; =20 return 0; --=20 2.34.1 From nobody Fri Sep 20 07:28:14 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79695CDB474 for ; Mon, 23 Oct 2023 09:56:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233472AbjJWJ43 (ORCPT ); Mon, 23 Oct 2023 05:56:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233543AbjJWJzq (ORCPT ); Mon, 23 Oct 2023 05:55:46 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FF4910D9 for ; Mon, 23 Oct 2023 02:55:13 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-32003aae100so2389616f8f.0 for ; Mon, 23 Oct 2023 02:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698054911; x=1698659711; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G81EZhNEBfjywIhuDWJjtpTXYP61176MP839Y8OZoG8=; b=lHOLSFUc0yK7Ro+MNrul4bf5L+2cj3y+D/gX6YW5Pj+FKibWdu8iplLyLvCTxmygYD YH7cXdyN/KUjsLkK4/m+u/sRyop/blbjSfhT4Jl6bhkQAI62YFlTY/TW7BRk2GP8OmDM lmFU6jCnbRr0lw/r0kqAkYnR2FcJkRVoPGLIOMwkc1UIyw5W7cQLT/+uJdFncBFAKkXF FjE3ApzCTEpTKv3pmE5WFjvH4mBNHitMwYgPTGUdZqtgsRTGcqtGcStvDwqUZt3/Bcod TXqYkOybMDJENO801txAvYhXZeCaOJDyh5ckTdVT8J/nIQU1ZJAtUww31tZSMosi/E1Q AgIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698054911; x=1698659711; 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=G81EZhNEBfjywIhuDWJjtpTXYP61176MP839Y8OZoG8=; b=BeR/o986pIWUlotqw7AnG4Nm0wallArnL2ueKQtCOwQH1VhS47a3r5tAU5s0W4G8MO jDuS8/SXtyTyPXWSZ0JSEUn88jTJSFJbGSeba+X27h+58Bs/G0d3rvAhMaKwpN85RXQc fFE+w2ivwjDocXbNBH3nITltQFpxRrdwkIUhuMu6JJFukBxBn52AFl3Fvt00KLN/vTGc 3yKVewZ+qEjWzH2SwgwZzs1eKgiZLZCbsXtI1lPOGqb2C0MZ8RLNx7cP3623c1D2Aw6Q pWiqGtYwUjDWl6+7cXnM2pvthBWSqYf3vioP1glxMM+kX/hjoIDledz83r1jPbuZpXVj qHyw== X-Gm-Message-State: AOJu0Yz79rd3b0gj5Y8m4tn2i5b/UfjoIhdHRvj8ZWVp8ZPtwLhNcoWP 0ejOqCJZ4Zg7PRnZGkObKp7y/A== X-Google-Smtp-Source: AGHT+IF2iXpBOUlnIxhQVTQ1O4HJJuZY9k94V739kocrPuR1iW5RroQxWCPWTyJ4Y36tYCQLJLsx0Q== X-Received: by 2002:adf:a499:0:b0:32d:a3f7:f0dd with SMTP id g25-20020adfa499000000b0032da3f7f0ddmr10781049wrb.25.1698054911534; Mon, 23 Oct 2023 02:55:11 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm7428801wrq.20.2023.10.23.02.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:55:11 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Srinivas Kandagatla , Banajit Goswami , Oder Chiou , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Thierry Reding , Jonathan Hunter , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 17/17] ASoC: tegra: machine: Handle component name prefix Date: Mon, 23 Oct 2023 11:54:28 +0200 Message-Id: <20231023095428.166563-18-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> References: <20231023095428.166563-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski --- sound/soc/tegra/tegra_asoc_machine.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_a= soc_machine.c index 3caadee9584f..192e9692bdf2 100644 --- a/sound/soc/tegra/tegra_asoc_machine.c +++ b/sound/soc/tegra/tegra_asoc_machine.c @@ -81,19 +81,23 @@ static int tegra_machine_event(struct snd_soc_dapm_widg= et *w, struct snd_soc_dapm_context *dapm =3D w->dapm; struct tegra_machine *machine =3D snd_soc_card_get_drvdata(dapm->card); =20 - if (!strcmp(w->name, "Int Spk") || !strcmp(w->name, "Speakers")) + if (!snd_soc_dapm_widget_name_cmp(w, "Int Spk") || + !snd_soc_dapm_widget_name_cmp(w, "Speakers")) gpiod_set_value_cansleep(machine->gpiod_spkr_en, SND_SOC_DAPM_EVENT_ON(event)); =20 - if (!strcmp(w->name, "Mic Jack") || !strcmp(w->name, "Headset Mic")) + if (!snd_soc_dapm_widget_name_cmp(w, "Mic Jack") || + !snd_soc_dapm_widget_name_cmp(w, "Headset Mic")) gpiod_set_value_cansleep(machine->gpiod_ext_mic_en, SND_SOC_DAPM_EVENT_ON(event)); =20 - if (!strcmp(w->name, "Int Mic") || !strcmp(w->name, "Internal Mic 2")) + if (!snd_soc_dapm_widget_name_cmp(w, "Int Mic") || + !snd_soc_dapm_widget_name_cmp(w, "Internal Mic 2")) gpiod_set_value_cansleep(machine->gpiod_int_mic_en, SND_SOC_DAPM_EVENT_ON(event)); =20 - if (!strcmp(w->name, "Headphone") || !strcmp(w->name, "Headphone Jack")) + if (!snd_soc_dapm_widget_name_cmp(w, "Headphone") || + !snd_soc_dapm_widget_name_cmp(w, "Headphone Jack")) gpiod_set_value_cansleep(machine->gpiod_hp_mute, !SND_SOC_DAPM_EVENT_ON(event)); =20 --=20 2.34.1