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;