From patchwork Mon Oct 23 09:54:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156799 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182048vqx; Mon, 23 Oct 2023 02:55:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFR+m34U2Gvjq+EbMFgSBmQQUDIwzgcfgISCtQ1/J6tt5PN/V00y/3XFwZ5ThzaPw8a2OFX X-Received: by 2002:a05:6359:3518:b0:168:e53b:bb40 with SMTP id un24-20020a056359351800b00168e53bbb40mr814426rwb.6.1698054906947; Mon, 23 Oct 2023 02:55:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054906; cv=none; d=google.com; s=arc-20160816; b=a4mx40x745rlcnoX26F1ywLTmSCBWLuKqScKABd5NKo5Yv+mvlmE+2AHoMfrFUyPhR osE5uF/VmBhvsD7L9KdD4KjE2jaueK5+SVnTiPcMSfkLNqQLl0kA03Lgvn3UU3rrEPnA rkF+uGD793eZYELRkfUuv/4rplaGEtUg9pldh/MJMVhikNOb5VS3e1Fzr6mEgNbLgKtJ jJoCNMkONtyzJrvmb+velOgsuJx1KAhc1RLFi2cG8AT/9niMTZysZcRYaEybKXSEz+9K UQq0jkFW8ocbB4rzZM/xCmYMscl5BcIDxaBz6Jhs/lTRMZZt5J9AexrqQGxUCX9fp3e3 viRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4YC/W8702n/IhtK2/nRJYRFXj5SA3+z6eWXwAmZT4eY=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=LfXL84PIPtphx1zLwIBJEe3fz1FzJQ1IctlnAdIGUb16DkfbTxCUt65ud0X4Em7ou8 +QAQnZj69zPnPYUjz2rqPrJ9M/M0mFur/JmX2xuX7wBxIdpDDZWoZK+H++iRWtM3YdsA TP/Pv5tqOTjYvdSGNDU+V46KZnX7unq/+m7xBNADTs8qgwc7gP4sRGWAgwGvlt9K0ZOU 0of392tmoXSQScAsjMxSSegDU7Y2o5fPWgEe2gxi2xOHf7voj/nh4sfSsD4Pa9WPJEXO eih/tr4KVPCtxyL+RnPzKNW5GmjjhWznorOTt0IG3ZBk6f6pqf4q34dJbHNp+j7OwqbU 0h0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=z8wzB8AD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id d15-20020a63f24f000000b0057cbd803b30si6274453pgk.654.2023.10.23.02.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:55:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=z8wzB8AD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 5E8698054B22; Mon, 23 Oct 2023 02:54:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233242AbjJWJym (ORCPT + 27 others); Mon, 23 Oct 2023 05:54:42 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:54:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539622305047760 X-GMAIL-MSGID: 1780539622305047760 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 = 0; int data; - if (!strcmp(w->name, "Left DAC")) + if (!snd_soc_dapm_widget_name_cmp(w, "Left DAC")) dac = DAC_LEFT; - if (!strcmp(w->name, "Right DAC")) + if (!snd_soc_dapm_widget_name_cmp(w, "Right DAC")) dac = DAC_RIGHT; switch (event) { case SND_SOC_DAPM_PRE_PMU: From patchwork Mon Oct 23 09:54:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156796 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1181958vqx; Mon, 23 Oct 2023 02:54:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+9Aq5ArL/CdNjHaywS5XMzWJoF3jJJZBbYL/cHG2msrFZ0TVaNY9/FjDoYSuBJrDJlR3R X-Received: by 2002:a05:6359:220:b0:168:e48a:8b25 with SMTP id ej32-20020a056359022000b00168e48a8b25mr1304301rwb.0.1698054891916; Mon, 23 Oct 2023 02:54:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054891; cv=none; d=google.com; s=arc-20160816; b=DEPDtt1pyb+Z7XS4IGcX7PuTziF6C28sD59/ApLyFPlCeMIQU0NUA5zbkt4LcdOOzV c41gxEr9XGcCfJhBjhTQm7cEBRyWIx7KA/ZfsklmGvw9JQSDPtYw8MGVVB0SYboXkAEG c2uwpGVrKfN2P/o/wkOea2NqSX1A43oYDwtzvTzdejXTmax7pXuMLi5TMLlXfXrFV/EJ aYk/5gCsZDAiu95EA5DtyS5mj3d2ZeB8e2gFbJkzYazbpB3EQM7apgUCkDbMRM0xctI1 3jKQrZlRmj7go6YUamu0EFymqzHhcWaAuUvDrLIvDpaJbWjWhkL9jAUyZjpaXBV5qa6R +g1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xJErgU+nUAjpf1N+MX3RFSZtoYrYFdNiReNrVNbPccY=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=WTrLnxeg6Pi2LoDp4/OnlQXe/25rcHo3gYztxbfP4P3FDgn1H/3I+nHiJ0xn9QifKk JoC5J29aH1FS+cPUDS9/jyl2iiZ6uxoFjlfLa4cp5vUkialDM9Z2LxljoZf6K4983oL0 kI7xOCOrYhwS+r54ScY9RCmMBnUjBK4ktTvuD+7dn4lgIu0Jirqa8G/K3hA+qNM4aCes ReHTlS6EiMwopGAtswQcE1XcSX9aC1q7kd9ZmaPOFbGdrpw8h+IEBHzCDyYnLHJ6Pnwm 9o7P5i/AvgRSaTMhrXW0GbRCNVPifdJ8ufshUTVmA/ewvyHaqV+6r/x5EIaiiRvln0tA awxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="hmVeL1P/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id w29-20020a63935d000000b005aa1eac37e4si5928085pgm.87.2023.10.23.02.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="hmVeL1P/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D72C18045977; Mon, 23 Oct 2023 02:54:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233280AbjJWJyr (ORCPT + 27 others); Mon, 23 Oct 2023 05:54:47 -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-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_S=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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:54:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539606346505344 X-GMAIL-MSGID: 1780539606346505344 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_widget *source, else clk = "SYSCLK2"; - return strcmp(source->name, clk) == 0; + return snd_soc_dapm_widget_name_cmp(source, clk) == 0; } static int adau1373_check_src(struct snd_soc_dapm_widget *source, From patchwork Mon Oct 23 09:54:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182013vqx; Mon, 23 Oct 2023 02:55:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVrlT799n5I6ZluAMID8KL/lNeH6q053kzbdlXfodhzw+mJC8RLjiTp2ow8/YKeATN8xl0 X-Received: by 2002:a54:4818:0:b0:3ab:38b0:8b84 with SMTP id j24-20020a544818000000b003ab38b08b84mr9220333oij.17.1698054899853; Mon, 23 Oct 2023 02:54:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054899; cv=none; d=google.com; s=arc-20160816; b=liwbHiIH5h5D6b40bD7SElLJ4glC+t5yujP0K6ezROX9SOXr5hqJATOS0AhwD0uQGE 3CHTHGQRYBBuinzMrOaYizbMcriFpT9RmfRPYMXXTnUNg2xwWuMuOGyi4t8lPXsIrICK H3aT34/ZhoHk9w1qzX9DlNWabIWIZh43Ihi1KL2LhleutIdooPW3SunhlFPDJq3p+rUN FtQ5wMJVVHozkWdm5isJCJwkDd4QvXVG+00cc2IzRkbTXpT5iB2qCz426cRWRZBKtUQ1 a4BPGk2S7ouowLR205Jl3sgyrXnGwUQF4tuq8fg51BKzYLcNJUFq9PIuljX/UEiMCncX pTzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=P05PzWbQ4hBl2fNZN6KJaeVrZFnQ7VS3APzpcXPmWmM=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=o0wkse+mlUcpzAZOEXoKYyX5OmY6ACx5yQ4xJKzfS9twrYrmJeBhCNtp2oKVUDJJSn i59+mHIOlxC5RV5aGrf3amlOlyfYoMdn0N4QGogcEAMeG2OAXNFW41lIz0/QWJIzncgD KEIybQxvPZq8DyHv40Iv65YcBWQI7Mob80r27QwFkAk8dRNziMY8GL78zWpYoPB32CRN PXMrZBUMbm3C6y8Jce2SKHN3xEVvT5Txn8D76zetNVmSMBnVQQNfbKbxEHN2nXfAx+42 5pugL7zXkzmvJfdJalRTeZdjJ6MuLyYU4j5hsr1ROT1l6Bt69W6HKawErOuX70QCw+WY pzaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YyDzZncK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id k7-20020aa788c7000000b0068fcb7125e1si6363880pff.242.2023.10.23.02.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:54:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YyDzZncK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 7D63580A9F3B; Mon, 23 Oct 2023 02:54:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233363AbjJWJyv (ORCPT + 27 others); Mon, 23 Oct 2023 05:54:51 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:54:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539614828972841 X-GMAIL-MSGID: 1780539614828972841 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_dapm_widget *source, return 0; } - return strcmp(source->name, clk) == 0; + return snd_soc_dapm_widget_name_cmp(source, clk) == 0; } static int adav80x_dapm_pll_check(struct snd_soc_dapm_widget *source, From patchwork Mon Oct 23 09:54:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156798 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182042vqx; Mon, 23 Oct 2023 02:55:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDLs1aT5mhFXMwFi845Gk6N4rdSwbFRHonBVzwjVyxG4HKdWno82rHUTHytUZBuROXzFmH X-Received: by 2002:a17:902:d2ce:b0:1ca:8252:a91 with SMTP id n14-20020a170902d2ce00b001ca82520a91mr9602007plc.41.1698054905844; Mon, 23 Oct 2023 02:55:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054905; cv=none; d=google.com; s=arc-20160816; b=mdxIPrKMtjhOqLRxFyMHW1zrc0pKXO0eWbqVoyPz14VaI+p3duN2lBMU9kFAvsgsiC WT26htlhS6sbL0yxksthujlnybY9c5QxezMLub2sjeIrzMZix1HRqz5i2gWhraO+w/4q T5DJd9ysssxILBhMBllvTFFGYq7c06+qaFh0r7dXkoGM648EVnbMobZI4NztH6RX1wuy EHTdHMMSoq9wKKeboKluQLBWhKaAPX1hInd4bsiSxIyE/vzA7WZ8LgYZ3y8kKJlK8Wsi xjaZ5bSeoKhDUeKv2kfqoN6w0D3retCwJk5xzRvI8TzNW/LNntprJoDQ/rxJTqhU2hiy Ib/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xuBgkJ0BPVMUW15lL794m55ZCdp9DH+A+t98MliJqVQ=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=XFJWyTwqRe3MIe0NQO+u5XVyySRCq7pNycXsnT5zOTKRsLWRmQBUUPfVCImHccOhgJ KgP31GPNgfuBVaLCkr0FcoosUiSYGss587SrPTgjUhGjbluZAVT3gFQ+28WO97xIa54P Xlqr5YeqXDt+9yROX0ligJVHzpFyVSwDJr5aehgY9Z0Ynp+pGTmtPTv6+bMSWKbVwpIz THMcJi4bQc2CMN91wPDNLFrW0Tz8mEB4OjXZO9KmaYIpqZkK5T6jCVZNi03wZ0TIFpab hwGYdid03HYwws1FaffNpIIz7TjikyBtmR1ihuVMBSJzHSKsNKW9URBnpdpY3rM2lMeP 2YiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zj9OmFDc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id p3-20020a170902a40300b001bdf6eb05f2si5916266plq.227.2023.10.23.02.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:55:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zj9OmFDc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id DEAE78060CBD; Mon, 23 Oct 2023 02:55:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232476AbjJWJy5 (ORCPT + 27 others); Mon, 23 Oct 2023 05:54:57 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:55:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539620710151959 X-GMAIL-MSGID: 1780539620710151959 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, val = 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 = ((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 = (val & 0x0f) - 1; val = 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 = (val & 0x0f) - 1; if (ec_tx < 0 || (ec_tx >= RX_MACRO_EC_MUX_MAX)) { From patchwork Mon Oct 23 09:54:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156804 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182374vqx; Mon, 23 Oct 2023 02:56:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGCLjJvN90pBjb+kfVUcjv5zhKm0CKuzlkH3rP3mdy4YNzmeh67ZfdD7ogf/wZ+oeZsB/Yv X-Received: by 2002:a17:903:643:b0:1ca:4092:7200 with SMTP id kh3-20020a170903064300b001ca40927200mr5017542plb.54.1698054970036; Mon, 23 Oct 2023 02:56:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054970; cv=none; d=google.com; s=arc-20160816; b=W5buJRrS8n8lNaPd7OjuONCH0oqUM7dpEuAZeuJ51dDHJpiwA0+K60IfhbiKyW8J6/ eK+wV9I3qv48cxm5kgJCiUyAwvX09Fv6wWr0TudbGIHw6Rn4q1JEwFvHcUZNMJzcnwKP cBObzRQMAjdZBj7zZOVNbsfOqjWKoWuNZaFi5PUJUGCtbmir2bKO8luUio7fQPgAvQ5j Cj6F65C27Ngryx3N1CTW91bUawuFcXNMVEs2OM+Wwc2W+jQq9FuTSmKdXdRNlTItTkHZ TQTV8ZjZj1zmYEa5S6z35bvHirO3uZ+0RCDl4A0c/2bU9Yp+fCXgHCo2uLQTUQ4NQ3TM Yw3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TezS6fAbmZRfIE/9gAJPYUtZvuonet12GZ8K7ihJ9/I=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=IDpwVSJFpuJpMiHuue02/QRBxyP4C7ziJXj/QsPU+9dpQ/Rbu5UyHtY3t7XV7db7B3 1gnZ4WavS9rq+6pYCehfFGs6yVIadWCfbsx9M9eQ9qP0wgd/MgzsDEOSlS81iz/Ubb4q NXoXROcXd84DseNdTUOLhGkXof5dHNCl2sWFkT41da8qXlLNrzXN8j7uEUoyz8oHsA95 G+N6MbkwsO/M49Esw6iA3i79io4fcFdVDwv2nznhaNlZGNXdMEyZY1OdPuyzIzc3JMrA HJ3fVYCacaR4AK3GjMzZgOtDFUX/ZkcYMuW6SQfjUgCplw/Npl0PAkvWF3ySTq9QHahz kABg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ayJhQrpX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id i16-20020a17090332d000b001bf0916b665si6375100plr.393.2023.10.23.02.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ayJhQrpX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id E7541807E44E; Mon, 23 Oct 2023 02:55:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233470AbjJWJzB (ORCPT + 27 others); Mon, 23 Oct 2023 05:55:01 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:55:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539688136351465 X-GMAIL-MSGID: 1780539688136351465 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_widget *w, struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component); enum max9867_adc_dac adc_dac; - if (!strcmp(w->name, "ADCL")) + if (!snd_soc_dapm_widget_name_cmp(w, "ADCL")) adc_dac = MAX9867_ADC_LEFT; - else if (!strcmp(w->name, "ADCR")) + else if (!snd_soc_dapm_widget_name_cmp(w, "ADCR")) adc_dac = MAX9867_ADC_RIGHT; - else if (!strcmp(w->name, "DACL")) + else if (!snd_soc_dapm_widget_name_cmp(w, "DACL")) adc_dac = MAX9867_DAC_LEFT; - else if (!strcmp(w->name, "DACR")) + else if (!snd_soc_dapm_widget_name_cmp(w, "DACR")) adc_dac = MAX9867_DAC_RIGHT; else return 0; From patchwork Mon Oct 23 09:54:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156801 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182314vqx; Mon, 23 Oct 2023 02:55:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbmyKcDX4lQRQQVYjLAs4e9ULY8jMDa7os1zkGXtaKMrxjjjkf5ZwPelrd7Huply0qcM9K X-Received: by 2002:a9d:7483:0:b0:6cc:fff0:8eb1 with SMTP id t3-20020a9d7483000000b006ccfff08eb1mr9130557otk.23.1698054958043; Mon, 23 Oct 2023 02:55:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054958; cv=none; d=google.com; s=arc-20160816; b=IxvWyIRoJa3Fad5C2PPN0zSJEIDzkpOtq43tPYegP+sZAi7syvSDNDIh3xsZciAcMQ F1Y3exmF+IL08MUyE9oNUAvHVBxL8T4xsvjEUGidSfuHNy4PWP1ZeE0eYnlDKOHERYsM 9jnIfag8zOMuc2FRnG1PoOhK59hKc8UGVZCbFrEXXBzz8OB3Kd946A86WTSbSt/AR7Wr DRi99rYc0EVOxOC4bGADYzjRlQ2HKAs3/5CTejUWT7rqJqpdMAEMEpHHhGdLEocXO0/g H7mFcWiT4lkHCg6XC733LoUlRCve/k7xit07zFFZWzq0Pge5ovV4QdxO9yfbp3SEYffv JIEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mg1xiJ4tpWrc01TGrYLaIzComQYv1hvzEAR610Ntv3U=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=KbeBqpa9P/DUUq8qbx/GeIJYE8poo0lNkVaDUMnHkys55NWofA3lNif2djRiwKeJaw FntwumKtFWTevSt4JeZrzd63ZLnGgSjpLkMO1rkKi2pnfNaxyuS/Y5hGdOeSpDXPwrS1 P4OHl3gTGoQsdbkZmWL06Yss3wHdliuy4cUD1PZbIDCdk3Y6ZhSVR+hRfYBibC0vJEmd 2pWaFz/8nB4SuUX6z5GdFq2hS4vhd5uxmUyOG13oWxNF+7mgZZoSrGzQMK4Wy709ikl2 SlvTQGXQG95WFB9ipMS0kKWJzUgngbvAEtS6jUffgO8Liqki9l/KxCGYuWPNvMFJLyLK kMtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JvPo8itj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id e2-20020a637442000000b005b88cbc3d87si4409029pgn.638.2023.10.23.02.55.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:55:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JvPo8itj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 5B7C98077930; Mon, 23 Oct 2023 02:55:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233381AbjJWJzF (ORCPT + 27 others); Mon, 23 Oct 2023 05:55:05 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:55:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539675215009868 X-GMAIL-MSGID: 1780539675215009868 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 = 1; - 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); return 0; From patchwork Mon Oct 23 09:54:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156803 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182350vqx; Mon, 23 Oct 2023 02:56:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaeS2115GjgaL+cMv9n+AXpRQonvzHpCclqau+OfrqJQ20rAbDoDq75jCP6GiS13f743gn X-Received: by 2002:a05:6871:4090:b0:1ea:7002:494d with SMTP id kz16-20020a056871409000b001ea7002494dmr9395098oab.46.1698054964567; Mon, 23 Oct 2023 02:56:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054964; cv=none; d=google.com; s=arc-20160816; b=Mop7CkSN052u6sUBMWaWa2h6BCAro66U8RaJuyYfewumIQzfjXhq25YJQn8vfnlr3k 9oyOJkIglNFTR8KUL2yp+7UhuwskftjScG3bSns4BQBgR8oyPGHAFkMJGJ49FEloCIwJ II39jqomaZIokRiaEghn5+oQCNkMBgEYRtuKPg0QMKDZ6WUajhsCDgANx00QR4WkBCTs wLPmilImUbYkyh91Qnv5iWFY6ZQ0XX5hYqrfz3fzAxH0DoHK95ZdATEc0SNMJsLmnnVQ xLbo0a+bJBVveK1MLjZY0tK0j1nAJj8rxSrYke477u3ORmF/ajH3JkNZijO14wVpT9PC PyVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ohG7h5MVOd61zy+5ypL65RpxKjVv+oL8L5RUWwJJdI0=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=wMnOg9YBMcqGTgNDwooEHzmjIWag8fnHhym3JXh07YQRsX8Rsnbk4wJhPHbGlzR9Ys VOFd8A4cDBEWfPntoLWoOcOK/Oe0asug1XbQchPekANRCzVdw7Cyuv4tDUDyKNnIkYsc HdK+sHHGXPDryojzCUPHl1+q+XLJWlkdZA216sDqemuPPdl4+MDRyssGankWNh67q0xD jFLEzPIw+oooNW1DkrB7Kqi/lIedlRxC0jkqlPu0aLvoBML2q4TmCBeo8ANE3mnroApD 4p4o3u/IqAlMkQbESS7k8MwAA/Ba6aV1CAE6Wjw//14CobSlxwiA4nbZ0do+QivVgWiY sY7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zt1WSV92; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id m65-20020a632644000000b00578afb3123bsi6201998pgm.700.2023.10.23.02.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zt1WSV92; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 62521808BE55; Mon, 23 Oct 2023 02:55:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233338AbjJWJzQ (ORCPT + 27 others); Mon, 23 Oct 2023 05:55:16 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:55:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539682270578858 X-GMAIL-MSGID: 1780539682270578858 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_dapm_widget *w, struct snd_kco dev_dbg(comp->dev, "%s: %s event %d\n", __func__, w->name, event); - if (strcmp(w->name, "DAC1") == 0) + if (snd_soc_dapm_widget_name_cmp(w, "DAC1") == 0) shift = 6; - else if (strcmp(w->name, "DAC2") == 0) + else if (snd_soc_dapm_widget_name_cmp(w, "DAC2") == 0) shift = 4; - else if (strcmp(w->name, "DAC3") == 0) + else if (snd_soc_dapm_widget_name_cmp(w, "DAC3") == 0) shift = 2; else shift = 0; From patchwork Mon Oct 23 09:54:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156805 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182399vqx; Mon, 23 Oct 2023 02:56:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE8vBjlfQvoY8rXwwPSwO428NBCfy7kKSkX96okIBGhMMySKjrF3U4hnDodvUW2xOrveMic X-Received: by 2002:a05:6a21:7782:b0:16b:7f7d:8364 with SMTP id bd2-20020a056a21778200b0016b7f7d8364mr8943386pzc.58.1698054972346; Mon, 23 Oct 2023 02:56:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054972; cv=none; d=google.com; s=arc-20160816; b=koC8tsw5USOyT0Xg8ZmXgIsFH6G46cAKKqO1YAMxCfz3aInB0jp7RKgCKA1lsFzovR t703ffWRmANfax3XzOXBLWcdrl8YerAc4sFfASpwAsKhBzmbkp8OMKoGlv7aw6AEVm7V JCzdenvTVFae/9VBAx2KyYCEpCMR1JzAnc4eWR/G8GZOg+8U5eaKCjETo6CPYaUH8T0q flX+j3kByuAJu4O6EhVYpCd4NRl3bjqnokDt4tGIyxyc/GgP0HYGJZQ3/ZZuMnw9u3Cw mAmdhBXH1rtL7MdGqM2nqpgvmC9iCFzF2J1ssYaO8EM882lzJDuy2r8Kb72I50kqBGip gWKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9PvbddIvQlG0l/ZDn5njSVhrq4RgzTBlbX25/MYIgFc=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=ZWfrfY2z6jMHjiwgNHumIGEZpOc8rimj7sTayOaR5L7gzHANb64aUmDIth1GpuhOYF o8PGQ/acZ2+gavwy+IusLBe10hIr9PQM7Od1OJJL8qXsmJ02gQg6XkN1RIwzGGS/wd7B TwFjMlJ1dpCZm2ug7Xd3YzTLZ2fs83iU/BHHoi0JMoBPxlb8zw58nXDLxRrrMrgHqKjB TO6+MunQScZIHzea38iNfTQ/MDoD5qcJrDwneE3uk+GB87m7L3lnT8fZGSVi5JkkL1zX ijawsrhDELcyty3w4RsW91q6iwAU6kywXxtfpNbW5bEMDYNVEDAsASBIyk6vSCXHSfHo NAaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QL3y9JEc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id lp11-20020a17090b4a8b00b0027760c30acfsi6524550pjb.4.2023.10.23.02.56.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QL3y9JEc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 1EA6780A0DD8; Mon, 23 Oct 2023 02:56:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233381AbjJWJzW (ORCPT + 27 others); Mon, 23 Oct 2023 05:55:22 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:56:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539690369502465 X-GMAIL-MSGID: 1780539690369502465 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 = 0; - if (!(strcmp(w->name, "RX INT0 INTERP"))) { + if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT0 INTERP"))) { reg = WCD9335_CDC_RX0_RX_PATH_CTL; gain_reg = 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 = WCD9335_CDC_RX1_RX_PATH_CTL; gain_reg = 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 = WCD9335_CDC_RX2_RX_PATH_CTL; gain_reg = 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 = WCD9335_CDC_RX3_RX_PATH_CTL; gain_reg = 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 = WCD9335_CDC_RX4_RX_PATH_CTL; gain_reg = 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 = WCD9335_CDC_RX5_RX_PATH_CTL; gain_reg = 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 = WCD9335_CDC_RX6_RX_PATH_CTL; gain_reg = 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 = WCD9335_CDC_RX7_RX_PATH_CTL; gain_reg = 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 = WCD9335_CDC_RX8_RX_PATH_CTL; gain_reg = WCD9335_CDC_RX8_RX_VOL_CTL; } else { From patchwork Mon Oct 23 09:54:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156808 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182536vqx; Mon, 23 Oct 2023 02:56:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3LaWcieX2pHfaaFtix/ONdmI0KUxu3UMUuskTAiUVtJvs4JFUnihj2A8/Cwb9PfAExDUM X-Received: by 2002:a05:6a00:138f:b0:68f:dd50:aef8 with SMTP id t15-20020a056a00138f00b0068fdd50aef8mr7704333pfg.4.1698054997120; Mon, 23 Oct 2023 02:56:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054997; cv=none; d=google.com; s=arc-20160816; b=PGnDmoDJCtibBySUWbQ2K+10/bgs+Q5StJH4FEhnK1++fi1W3e2I+TaSfyI2YF9FP1 t1XQL4QvyThdfxQhbW+JYzGPY8JB75KWBZ+xCNHLBCedZnt7OG/tCG+kbljo7jHruudq EWOJB+sEeoHU5nbc0xlV22tkgambXjecaRdOqNX0LHTzUrJ+USXQDvnrRFnui64sLIng mlNL9smzMPptbtYTj9D/YuNl3oXOmmkCqWma78q74R27gphVVZC7ZQFXLGsuKNGaVe4/ my64pej/KWACCfYWXTYp6ojsXH5S+W9n00NRG2uArhKlvzvpzUSXMkShBwN1x2s4AziG HzYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iygGW2h2lVMWeGfG3UfW0SGTTyTrk1COvj9PMOD/Pf4=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=cQ0igB+iUqOppRBHdgxsXkseizF6puQyP03hb/5wwzfyo9AR3TLVfyTZufMIzQzE8J VsJ2EgzHIqAssVVZaeLB9ryDp89TFylsAV4MQrgQE4rtkDedSvtfV8eLpHLJFKfGS/Hh Gw2xTqmUVkTvBa+qFT4fVm1REwVcYSEC9fHGaI8PJdtpYyokAJPlKyp+pvTSmjg8/QUr qfzdFp7QgNqMfkAHnvbDQhscR+OcA6tx6b792MIbcoRhF7DhnFRn4GYF2XK5EINN6w1N uSEHwMBeSGLZYOMJCeIgw5fa4ZjybZfJncEWm02cvISIj8PdAXxqzmVpwm1kLoOOJCIx 0z/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qUpXN0IL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id l24-20020a637018000000b005898e10f9b9si6012174pgc.213.2023.10.23.02.56.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qUpXN0IL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id EE7268095036; Mon, 23 Oct 2023 02:55:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233341AbjJWJz3 (ORCPT + 27 others); Mon, 23 Oct 2023 05:55:29 -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-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_S=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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:55:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539716568012924 X-GMAIL-MSGID: 1780539716568012924 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, reg = WM8962_ADDITIONAL_CONTROL_4; - if (!strcmp(w->name, "TEMP_HP")) { + if (!snd_soc_dapm_widget_name_cmp(w, "TEMP_HP")) { mask = WM8962_TEMP_ENA_HP_MASK; val = WM8962_TEMP_ENA_HP; - } else if (!strcmp(w->name, "TEMP_SPK")) { + } else if (!snd_soc_dapm_widget_name_cmp(w, "TEMP_SPK")) { mask = WM8962_TEMP_ENA_SPK_MASK; val = WM8962_TEMP_ENA_SPK; } else { From patchwork Mon Oct 23 09:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156802 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182338vqx; Mon, 23 Oct 2023 02:56:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3ZuMlZo5ZJ+J+q5u2WpYhF3uYZOctGvjlcPZo1LcieirzVZOcNha6WjwI3Dv+DsOxkt+G X-Received: by 2002:a05:6a21:9809:b0:154:4246:d63b with SMTP id ue9-20020a056a21980900b001544246d63bmr5272526pzb.25.1698054962275; Mon, 23 Oct 2023 02:56:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054962; cv=none; d=google.com; s=arc-20160816; b=glY/du7d7jDQiFbPDVjBMe3UTAvfA3XL8No2euGW5h1uwbFmrOIy07CKFc22HxHpnu u5luj2KYh4N+GVl8syOHJ6WgrCbZu+hTgfjTGGQUq0J8DIr5nrWPGdyq+Sn+yBYg52kO 95Osd3w03jAu3xNvL0DMxumrFsBE8g+GkCuxpxiS991ijAeGXr8mu+gIppxbLBE6YiJm V66XiqonWzh/4QRVRNRKMteMJyYsxKW+p7BNdpDQzr1ScFcMgKIAvtpFBRz9bENi2z+f 8MTFnDz0jZfYTM9cPcFpzRMOppblLuGAzqg++pg+R/R/RU4IYjRJjCqCMplt3gwqp5fy o9Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SkUvzAZAFAxBUpUecaFOI7DumC3gwDv4zZE7XoEdjuk=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=PQKDPKuEA/0vcgyuqnxmOtgACHn7wrYdOEOWZo2/XTgWpudHtIfbsMw2t5KbmnjkCp sAhRxw9yhVoaPgreYi//H3aJPGSgL90dudfBsfF7STc0WHYMIJDmEoIlVoPfn++4y8qQ YMDQZQtz9jmJoMCzoV0VRCgLH5z52XuoLpL5IyP09kCqf3ZbwhvmQPgFZGPtTWhSR65j Ag49DnqoZvhgWzHiFCgbbR/OoFfuErbgHTo7kWnHoh0ziA0ZYHZgR8sRJZlmPg5VLHDl Mf+klmYIATDsE2XQgbbb7J7j5KCzHUX4m1fe7iNFmODXxtRQrtaGNykpZ8ifD3SNDGCA lglg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q5ynP456; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id m1-20020a170902db0100b001cbd8dafabfsi697745plx.567.2023.10.23.02.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q5ynP456; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 99EA88057E3B; Mon, 23 Oct 2023 02:55:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233632AbjJWJzj (ORCPT + 27 others); 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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:55:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539680061165192 X-GMAIL-MSGID: 1780539680061165192 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 *source, else clk = "AIF1CLK"; - return strcmp(source->name, clk) == 0; + return snd_soc_dapm_widget_name_cmp(source, clk) == 0; } static const char *sidetone_hpf_text[] = { From patchwork Mon Oct 23 09:54:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182557vqx; Mon, 23 Oct 2023 02:56:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExv0QxfUe/fGA8CRI3t7mJ2Yo4WOoyzImJYEVQwemBn6GMAFJ8Y8fTa9q9uQ8/tlKRP91H X-Received: by 2002:a05:6a21:a593:b0:15e:b8a1:57b0 with SMTP id gd19-20020a056a21a59300b0015eb8a157b0mr7172788pzc.39.1698054999085; Mon, 23 Oct 2023 02:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054999; cv=none; d=google.com; s=arc-20160816; b=uhNOpzM69fzUEw2nm7dDa3YvJs51GPPgoO6ihrKi53PbI4LBis9RqIT4rN+U1axqI+ LrWoW9soAKfDyG0PXR78M5CsahOwED0HX4xEUs4gtqWMNHbcSpTl5P2V0eXDTV5qxJwN kYQLsmTvzT10yMZIQbP55AS3eX9YbwO1bhjzxB0KQLyRsDxDIOVUXmxXRKHn0SoyyNo+ o16rj4b25S3tP3aVsME5B8LRLGeJGTC5kZjMAl2jHB72FwQ3C8C76l6IZzXv2LsxTLUy Z9oFPgojOq2H1qf+pi3qmMq3nu4qKvWQuoZ2n65r0qdO5hj8chQEkfACJRstGxH4pp0u YIZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sOdWx51KZzcP4yPFkM05Libt2LPoTXL1hZ7dHc5xIDc=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=ryc2u+r6IFtt5Y2g8DnAWS4Ubh+f8dNas0Fvm5YZgXdOalzycXIwdIsHq79Rd5VmIO nuKu7ag8NUQQlwnDS3h1KyNwgymn038tCTjuGPv/mqgdrS1jGlqfUbehRKFBiDGZv9X5 Zmb4Yoz1vNEpvCAJ0hYyQX84MJ+5mc7NqNyPeyeMwPRrMA/ReWQxmCpJWtoplmdDDBwT mRSRBL9Iakt6XTjziUgVhczqlXeD0S+aDq5/JcVepf28Ey7qxZaeLa8i7bVyEHth95rD akOYhMkzLizoTrh8oya6YN9QjT2NvgDbydSF4BdZfKhWw1jzqUsU66v7V6/YtSAPwRYe OZvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VRzOtaij; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id c23-20020a170902b69700b001bb95a5cb9fsi5943349pls.522.2023.10.23.02.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VRzOtaij; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D8BD3809ABEA; Mon, 23 Oct 2023 02:56:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233646AbjJWJzp (ORCPT + 27 others); Mon, 23 Oct 2023 05:55:45 -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-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_S=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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:56:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539718931793886 X-GMAIL-MSGID: 1780539718931793886 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 *source, clk = "AIF2CLK"; else clk = "AIF1CLK"; - return !strcmp(source->name, clk); + return !snd_soc_dapm_widget_name_cmp(source, clk); } static int wm8995_put_class_w(struct snd_kcontrol *kcontrol, From patchwork Mon Oct 23 09:54:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156810 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182562vqx; Mon, 23 Oct 2023 02:56:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHWiaGLHploIG1c1a+dhRhg3niE+HHjUc0nWcCLhNWDA3DWsNR86K8pzQ3vBz+axVk+Ffxa X-Received: by 2002:a05:6359:6f87:b0:168:db86:261b with SMTP id tl7-20020a0563596f8700b00168db86261bmr2607148rwb.31.1698054999882; Mon, 23 Oct 2023 02:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054999; cv=none; d=google.com; s=arc-20160816; b=Oo66msOLfWMIpPx9MDLTOpgOFKJ/3WtYqqyNPsy11/TkzZ7awc3vUM1TQi8EHWhsu5 nK9Iv6puuFXSUUNSBFPUeuKfBfKQgtRaoSOkoV4uFOKanz+6U+1zr7faqpFwuudMFSOR Um6XAnMPnUkpMNpm9tepPRQovcnxQzWJRZss4l8miMgigMMYDhY0onxaJzMcUmMrXX2X 610myA1clW1lQIFlT/YSPoBKsDA4vrj38ctHrQqssaLZem/F3NWYcOsDo+h+cYdlUPpU 6b2epP+SWjMLQDxXIPUUYOO06aE/HEKYdncicsQSWKUHmKpgDQifDskDvuiOcBplTnJR qCMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XaRWK1PxbLteLkMq7b8+dA2nXiGKOdN1dmpy3IbpNyI=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=UvEXxfwqdbxzUyum7NXKpGyhoAmpVuToDYtFeYiXyUvH/tBIF80muPGdOXLpedo6i1 chW+06EUKOHJfqLADMHkuciCzylrX/XppbSaGyn086A1qjn27qM6hc2jZAG+LP6cOrn4 6mPMyG7VmQR0qvq+yv/bSdlCS3IccxNtEZRrVODWoBkdMuU5G9i9G4XU6XYhaEyRFFZ5 /hhoc29Yyr7dhdZai85mXhSTtToBw/MOyp9OSzvuD4bFkW/tkLChEcdWZhQWcA8fM6wG Pr9eiXisfaG5UfV7gq0vLGy7SzdVfr+QRubmC3s26BF9H4zIDENsZdCXtS1DQyYoAtEB LD+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wXssIZoa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a192-20020a6390c9000000b005a9b2800a06si6273318pge.787.2023.10.23.02.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wXssIZoa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 0E15A809818B; Mon, 23 Oct 2023 02:56:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233392AbjJWJzx (ORCPT + 27 others); Mon, 23 Oct 2023 05:55:53 -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-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_S=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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:56:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539719536219311 X-GMAIL-MSGID: 1780539719536219311 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/mediatek/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, switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, APLL1_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) mt8183_apll1_enable(afe); else mt8183_apll2_enable(afe); break; case SND_SOC_DAPM_POST_PMD: - if (strcmp(w->name, APLL1_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) mt8183_apll1_disable(afe); else mt8183_apll2_disable(afe); From patchwork Mon Oct 23 09:54:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156806 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182398vqx; Mon, 23 Oct 2023 02:56:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5mKbgk4dUuyOCg/E/EUn8ZFfKxTPWXVWkf3vKBQIbI6kykg1E2vxtYV7AtmbSSsk+c0CB X-Received: by 2002:a17:903:2642:b0:1ca:7439:f74f with SMTP id je2-20020a170903264200b001ca7439f74fmr8674978plb.60.1698054972219; Mon, 23 Oct 2023 02:56:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054972; cv=none; d=google.com; s=arc-20160816; b=HokgLD9HqizGevDRFzVSPynO4FloLcLabj+5hpYVOdUsCykC/fbYujrUaIzqcQ18zr JpoO+NqWw7ljOu7X6J0tuQ035ZJUzMkDt/4kfJmT4vwve8PrAl5ar495gP3S/q2pv3U7 FjWbdDaQICENH5BhM5qBFdqPqt/y4gMHyK4jEXuVEtvpyWolScY4FvxA7WmHPqZFNfQG zJTddbrrfIijXPmX9flYtbQx8f3Y6f5irc9BB1pR9I7AYcx3m5nnQW/gGp9iCACVf99M BopgtZSJecpfJlolbBphlAI748XD/ycjCGt1mGAPq+ZCuTKXZ5PP59RTcqCPQIfphduc FBQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sijvR+hKjJi+AfXfyjsruHtUHe1YLoATqzDljEq9PNo=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=kRhF8gToDR6UNqxZxifHVRrsHOVUh/RBa8DOVdInmhAF3/dzL0PrjHHwbD5aPlxO1C 5f93lm5tUmJGbVtTJDE57O6eSLXmkpNDydbSXbfoa5/1PIz3Gg7nXcxat9A21nETx+XF BpiSxpahJ+1jebtGtiP1bO+U4Y5RQxbezMCUUjD5DmS0twnXIA45MxAlsy2dJp0UIvTJ Bggarc/cfwSmZldiycLyaDKUB+Fu9lsVild20rjv4Im5jk8L/4D3gQfNfzsCNaRQlcVC leI1DsHN9CAGh1Rra7LzAWfVXJpBUQ5MOPQ+hLmURUFKSKSjFc6iEErkcojT9RanY5Sj XlVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fOHIyn96; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id s12-20020a170902988c00b001c9fe071f2esi5861002plp.128.2023.10.23.02.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fOHIyn96; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 024B18057D82; Mon, 23 Oct 2023 02:56:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233412AbjJWJz5 (ORCPT + 27 others); Mon, 23 Oct 2023 05:55:57 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:56:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539690677955417 X-GMAIL-MSGID: 1780539690677955417 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/mediatek/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_dapm_widget *w, MTKAIF_RXIF_CLKINV_ADC_MASK_SFT, BIT(MTKAIF_RXIF_CLKINV_ADC_SFT)); - if (strcmp(w->name, "ADDA_MTKAIF_CFG") == 0) { + if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") == 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/mediatek/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, switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, HW_GAIN_1_EN_W_NAME) == 0) { + if (snd_soc_dapm_widget_name_cmp(w, HW_GAIN_1_EN_W_NAME) == 0) { gain_cur = AFE_GAIN1_CUR; gain_con1 = AFE_GAIN1_CON1; } else { diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c b/sound/soc/mediatek/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, switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, APLL1_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) mt8186_apll1_enable(afe); else mt8186_apll2_enable(afe); break; case SND_SOC_DAPM_POST_PMD: - if (strcmp(w->name, APLL1_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) mt8186_apll1_disable(afe); else mt8186_apll2_disable(afe); diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-src.c b/sound/soc/mediatek/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; - if (strcmp(w->name, HW_SRC_1_EN_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) == 0) id = MT8186_DAI_SRC_1; else id = MT8186_DAI_SRC_2; @@ -487,7 +487,7 @@ static int mtk_afe_src_en_connect(struct snd_soc_dapm_widget *source, struct mt8186_afe_private *afe_priv = afe->platform_priv; struct mtk_afe_src_priv *src_priv; - if (strcmp(w->name, HW_SRC_1_EN_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) == 0) src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_1]; else src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_2]; From patchwork Mon Oct 23 09:54:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156811 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182566vqx; Mon, 23 Oct 2023 02:56:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQt2kFswNhJDpENitQek4YK/8oaDg4wIZLIbuvYv7HsZqYReP5/wAX9WWLjDcxUDwD9Q5y X-Received: by 2002:a05:6830:264a:b0:6bc:e8dd:9f4d with SMTP id f10-20020a056830264a00b006bce8dd9f4dmr10326076otu.11.1698055000320; Mon, 23 Oct 2023 02:56:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698055000; cv=none; d=google.com; s=arc-20160816; b=liN0lVU6wDeXQfsj9i36d2mj1izOHwFeEj3jy740mRTaDrWf4feDWPdww/TxtRRGnC 2pkEpZ/RP7a80JWdy+5joPx6tCJNadC4sQdwT1aubhaSn69703XwCjj3XFO3IaOGj6K2 lLxlDSSQaXm1mLDjZJ7ksHamaj0+xNFZqSCqPG0kGH0x7Q/qmFzK5wKJ03/AGePA/2N/ 5l9PYvr2KeHoH9/NVmVHRW84RUrMC1VgEAd0jrb83z5TWliuWgKjr0ne6ExBVwbRpcMt /2kbMtLGrmysZzMHonqXvQnpffRcafTGL/ofVqDlIrjDjvBPcQbNGEkdr9wF9yVwS/BM 2AUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Uu/sTtccUwF0ah9E+SK4dukpMAzlv54jZyNo0CSiF0c=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=w8nRviHZOQdOthmQYOkWkOX7OYHm68+PxZoJbs2q4qFbPx3b+WOl/QFx1NOht4NhKi 4WbieQKpEGFmAEDUMzBMUZznMSAHhyQvZA4QPYtowmSSE8hQA7mfG4Cut0scder+Myy1 YpZNnGi7kyKEm0ySgQMhz3/a7GJ7xekSP8wwlPHRQjq61x5JEo0kghmMXidIEPSMdmZJ KV7oqzhca3AHPDweVH1UCDtVkDQd7UWtXsCSZwJw34xcw+d/NIHiSlRlT0a9SbwXfoHe 2uS8jUmfy7ZPrxOYYBWm9JIngONmOH23FBj21O8r/IXwCM4eEtgTTAnefrAp/pgYuMWj SMCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UP0pQimV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id s9-20020a637709000000b005aaab9e7bcfsi6402464pgc.388.2023.10.23.02.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UP0pQimV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 21CE6804259B; Mon, 23 Oct 2023 02:56:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233303AbjJWJ4I (ORCPT + 27 others); Mon, 23 Oct 2023 05:56:08 -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-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_S=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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:56:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539719801079460 X-GMAIL-MSGID: 1780539719801079460 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/mediatek/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, switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, APLL1_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) mt8188_apll1_enable(afe); else mt8188_apll2_enable(afe); break; case SND_SOC_DAPM_POST_PMD: - if (strcmp(w->name, APLL1_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) mt8188_apll1_disable(afe); else mt8188_apll2_disable(afe); From patchwork Mon Oct 23 09:54:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156807 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182460vqx; Mon, 23 Oct 2023 02:56:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEOAMUI2U3ZXktNa50igCpwCXI9SYrp0A79vLyQpe05lkXRQZMTt6fxF6V0gCDeVgDNkup9 X-Received: by 2002:a05:6871:722:b0:1e9:8b12:89aa with SMTP id f34-20020a056871072200b001e98b1289aamr10453339oap.26.1698054983517; Mon, 23 Oct 2023 02:56:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698054983; cv=none; d=google.com; s=arc-20160816; b=07SMvWcuJRDhPNsyG8exRIATQeYpqKxfgUqW8vF7Y5Xw/5iSfWDIGv8ey+5qFcu4hd Bvvz4viXTTH6/+Z4GpBNHBc98bE2PakjnopBhvO/KtEwiAvRBFzYJlt0UXTnsJgepeax lpY2iGk4bdTsS5f08RjKHbwri0ZXH71hl9w8k1VzC0oyxXzYHB3d/S0rr+5eq80JutpL sG9JkfEacgOczK/dHsRPJ7cMKB1u/3uAZu/uVU06sr+Nmgh6Uz4y61AdzrMJbaWjmsoi PIScbBlNsQq48huHh/2OSWDI1CBCRJWe0FMngebDK/CkEZ46FgBLiOL5OhB88xauFXF9 b//A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=L7AsNVigM8lbJ2TEkTHkh3DJVAWVStJtaNwYVukOeww=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=VyVB/MWtdQfQrDh5J/04vYxnJhfvGMFZxYZmXufv+7yp/pzgvpgYSXMuOqkuNB3jIK 8h+U5T72cye0931Z9eLWLrSJ0y4x//re4/YcgnVp8h3mZYrYNjKHfnTdWEVpdx7USMlw U+/6ZuNRpRqCT4HjBfsG6xVThqx2R+qmEGbZqGtv0U/97zZ+EZ1obm/D6RIh1xtrr75e 49CzUEG/Gq6AxRQUOzle92+M38P7dlj9MtbGwNxIN8drpU6tU1md/yZ6OAplSra+Oo5X S0l6GhK/XbjlvdIyJXWpPpR8XkIjyUjuwRifd9WBudUNXLvxehOGkOK8hSyQb6KgWjY6 Psbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DuW7m69M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id bs189-20020a6328c6000000b005b837dc0b4fsi6017887pgb.445.2023.10.23.02.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DuW7m69M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 3BB40807780A; Mon, 23 Oct 2023 02:56:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229449AbjJWJ4N (ORCPT + 27 others); Mon, 23 Oct 2023 05:56:13 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:56:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539702128721257 X-GMAIL-MSGID: 1780539702128721257 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/mediatek/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_dapm_widget *w, regmap_write(afe->regmap, AFE_ADDA6_MTKAIF_CFG0, 0x00010000); - if (strcmp(w->name, "ADDA_MTKAIF_CFG") == 0 && + if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") == 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_dapm_widget *w, afe_priv->mtkaif_chosen_phase[0], afe_priv->mtkaif_chosen_phase[1]); break; - } else if (strcmp(w->name, "ADDA6_MTKAIF_CFG") == 0 && + } else if (snd_soc_dapm_widget_name_cmp(w, "ADDA6_MTKAIF_CFG") == 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/mediatek/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, switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (strcmp(w->name, APLL1_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) mt8192_apll1_enable(afe); else mt8192_apll2_enable(afe); break; case SND_SOC_DAPM_POST_PMD: - if (strcmp(w->name, APLL1_W_NAME) == 0) + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) mt8192_apll1_disable(afe); else mt8192_apll2_disable(afe); From patchwork Mon Oct 23 09:54:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156812 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182589vqx; Mon, 23 Oct 2023 02:56:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2X65T/XS643WSvtP58o81k4SYfRHflSjaGPNA7eSS5lqybeAvCYcEQdPZY00f9WLpWIXy X-Received: by 2002:a05:6870:9e90:b0:1e9:9c04:9ca4 with SMTP id pu16-20020a0568709e9000b001e99c049ca4mr12064717oab.41.1698055004616; Mon, 23 Oct 2023 02:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698055004; cv=none; d=google.com; s=arc-20160816; b=dEbQpDbzrG7TRDZ7knZZ4TJTSmmkisoMgZUhBG2fsjXEPDL+U/ut3n65SBGfuDFN+k b4MRzcjcrjEb3rWiR61YS+NoBEI2gpUwjQpG4yzqTH0R/BeFKzR1cCUg5pObPL9WgBSX 5tHyNTjvVnMY1wA4qDxve6HYX6GncYbRoys4DoGpFrTbasn3m6d3baEqpP9kZ30LN2q8 b8tAiKIcYmxxINNuvQfsO8J1hfEcPqJ54RU3MmFo/wmIpxl2Jm8OXR+1SBsphDhHTsk7 rNLlWymWdCoiePZbSThaGNWH8GjNMuMrfDGAeIVUn/he9MAgZRCdlq3CrzxN+O0RL9Mw OAkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZC07USduWdC7NjdC5xCXcdF31ciW6Iy95zkt28zTytw=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=Cyv5MWLqiqL0A6odvfPGPTgNeAydYNKTWhJBpUlShBGDlGU04eCxk9CSPZjbZ9RvAL Dw6PVg6xnYxSoHVgTcuRzPlWjz3DMJ6dWlDXyiObqatqXFEvykc6E3l3oekln5fCXn3/ hJmlIG4qGSxZnU+bsl6PTASzOAt3KrQ6OTNOU3JW9PHKm5JMhgOY2TLiQ4PHCtDRdbXs 37qpzfVeEXIoGglB4mTJjjWOsh9VLz2cu9rJdovMIsHQYcQZ3p74/CT8HDvhsYvoBnW3 ASpKsYpTirfKxzvVsUSsOJfaPylBP2W1F+2RmeEgP7IAswPyqX7SYlwclO0gegkeAtbd pWJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IN9BBhY7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id s9-20020a637709000000b00563da455862si6049402pgc.311.2023.10.23.02.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IN9BBhY7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3B3368040EE4; Mon, 23 Oct 2023 02:56:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233548AbjJWJ4X (ORCPT + 27 others); Mon, 23 Oct 2023 05:56:23 -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-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_S=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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:56:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539724234219244 X-GMAIL-MSGID: 1780539724234219244 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") == 0)) + if (speyside_jack_polarity && (snd_soc_dapm_widget_name_cmp(source, "MICB1") == 0)) return 1; - if (!speyside_jack_polarity && (strcmp(source->name, "MICB2") == 0)) + if (!speyside_jack_polarity && (snd_soc_dapm_widget_name_cmp(source, "MICB2") == 0)) return 1; return 0; From patchwork Mon Oct 23 09:54:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 156813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1182632vqx; Mon, 23 Oct 2023 02:56:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHoOkH1MUZVu8Mz+gCnTYP7xdyAMZG6b/lIJFNLYz0diPl2/10kGwji2j6563rBud/eziLF X-Received: by 2002:a05:6870:4d08:b0:1e9:68b5:d418 with SMTP id pn8-20020a0568704d0800b001e968b5d418mr11152725oab.34.1698055009383; Mon, 23 Oct 2023 02:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698055009; cv=none; d=google.com; s=arc-20160816; b=Q9NluoNSpNRFR8eAWQbqTniLPX0gP2iYYetA5MiXWHCbI2iwFyHjyrICIZ6sIKSvmD uVYWeZpSAcxHSRYHYzS1ko5HeJuVn1Xe1uN9TbBTdLrgQ1ZSvp12hnmLE29csp6/iXeS kU00RoZRnmVZFuevrwr8sH87ReC68EkMzpeDjxgx26FO3LdDTldLtj3N0m9vucyXesxw QkacbYOQ0TVE09JN+9zJWhlxGme05fPvubUIh+URhflPa6ip5AZd+KZe/fL2OmWUKrOE IlNm4R15fpJwtYjRVZ2zhsupP8fyIr9vo8PzG+lYwko+lNbN6PIc+xRgFE+Wi5Ew0Itj wwHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=G81EZhNEBfjywIhuDWJjtpTXYP61176MP839Y8OZoG8=; fh=pPU8cPGEmaNeTF1nbjD+SgWEFmm+pPPU9N7te9ooeF0=; b=iDe4tEGe+U4X3F0K58Rp6BwOqLu/u9kWHSTaUIYBXZWYcuEdi+hd+an9CcssGQGlNF SI0XeqDEwu3DtO8O9IrkilqdH83c7qQg/4jrswDHktZZdZVKe5fdwcnVaPO4GyMnA25F e+iH0Gop9J17WEo3GLvrdvIe3qNC5hHk1wTfov3z4VWErD1b3ACYN4MpbstxL30jUldy 8zFC3cAlsf7xSxblPy34R9ZpwE1r8LaspCFEmPJT98lEgfacEebR+zMAgfPQb6+eQbBZ roC7de542ByD7DJKlnR9k1FpcnF0KtXcMvMEEXm9o5mVvbF9lhBJvVOcFElXmRFpYiRB HlgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lHOLSFUc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id d20-20020a631d54000000b005ad1edab539si5988814pgm.319.2023.10.23.02.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:56:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lHOLSFUc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 9E98B8068208; Mon, 23 Oct 2023 02:56:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233392AbjJWJ41 (ORCPT + 27 others); Mon, 23 Oct 2023 05:56:27 -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-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_S=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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:56:46 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780539729425685906 X-GMAIL-MSGID: 1780539729425685906 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_asoc_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_widget *w, struct snd_soc_dapm_context *dapm = w->dapm; struct tegra_machine *machine = snd_soc_card_get_drvdata(dapm->card); - 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)); - 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)); - 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)); - 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));