From patchwork Tue Oct 25 15:01:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 10859 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1061418wru; Tue, 25 Oct 2022 08:13:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4eta7togcdEGA/JMiVkbnlbF3cnznkskUTQRefCo7iGKQ5GkhEZTK+6B7IUcjCQF5cdYg1 X-Received: by 2002:a17:902:9a8b:b0:17a:455:d967 with SMTP id w11-20020a1709029a8b00b0017a0455d967mr38751419plp.52.1666710806795; Tue, 25 Oct 2022 08:13:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666710806; cv=none; d=google.com; s=arc-20160816; b=lkSqu5JpOy+5nMOa1c0GDWtdiSMfsFvMSuLzi1x34cJQAVRawkQbHMHrDHji85T6qm CEpthyizm/gAepxafMBCnOBC9B3DAcfMN821sJK7GfmTzZulNlSSfmCCNHpLc2K7OK2e 10zBoYKGbHOP+HQNkZ59Ctv+FFxnZS3UrxMdSjNLIzBmsS2RM/KX8kVC4uka/MoaJ4Qp wKiQF7rPYTvOhv4qsM+s0tZOnbbGKajNIcCfIxuQtn8xvFhKKFPUAgdmXCe+bRJMagjk WDfDo6+f23vNkhpIhnootk9PES5rP4mKYk/LVxe3Dc1dp56zBSNDFkUIxV/+BmtoJ4VA cIkw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=xRxva5kPtIk4AgmMh5Ah5qs16fLVraMoyg8JYmMcBno=; b=aGt9/PT9TXihWK1LRJx/owgzRDh3mchft5D8mHRY8Zbci47ryXHgRdbiGqsfDNmhci ue4VSxrGNQCT6adyZ8do4/vxK2TDMjkskvIfx2wU6y3xSddo3A8Fhe1xrVeubi9+R3Bp FAsgYC5fiVgZFCpmpPHXGfPtO2IGAxTgsKhq6muNtRJ1nAFieakKWY7v59vD2So7GuYG LILyS3GWwPSZgcTj3hWc7mkn+7Ys52yHA30EedK9DMVNXkjv3DjW+di3GCXZEbGH97yG BxOSfq8mjPX+9fYQkl4wS9Tg7W5Q7eGOGORFOhlKS3Mn5/k4EY9YzLVJ0zIush3Sn1GZ sXhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=WoGntmFi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m14-20020a170902db0e00b001782a6fbc7csi3637041plx.463.2022.10.25.08.13.13; Tue, 25 Oct 2022 08:13:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=WoGntmFi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231549AbiJYPCA (ORCPT + 99 others); Tue, 25 Oct 2022 11:02:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232815AbiJYPB6 (ORCPT ); Tue, 25 Oct 2022 11:01:58 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B10119E00E for ; Tue, 25 Oct 2022 08:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1666710116; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=xRxva5kPtIk4AgmMh5Ah5qs16fLVraMoyg8JYmMcBno=; b=WoGntmFizqSg7uziAiWpH5vkz4ugrgLIaFQgV7uO5zGOHCikQwdp6kdWtXJudWr29Kg2fv 0FOO4EOdIkiNYAuyYFzYnRntmv9oZDxReSLf5ZOI3t97XCm5YVt2MsrcJeEzu6GDYf+1u9 +LKdo1Xbe7TwcFSdhU/0VIPsxSh6EhY= From: Paul Cercueil To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Kuninori Morimoto Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH] ASoC: dapm: Don't use prefix for regulator name Date: Tue, 25 Oct 2022 16:01:49 +0100 Message-Id: <20221025150149.113129-1-paul@crapouillou.net> 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,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747672951110683345?= X-GMAIL-MSGID: =?utf-8?q?1747672951110683345?= When a component has a prefix, and uses a SND_SOC_DAPM_REGULATOR_SUPPLY, the name of the regulator should not use the prefix, otherwise it won't be properly matched in the DT/ACPI. Fixes: 3caac759681e ("ASoC: soc-dapm.c: fixup snd_soc_dapm_new_control_unlocked() error handling") Signed-off-by: Paul Cercueil --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d515e7a78ea8..879cf1be67a9 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3645,7 +3645,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, switch (w->id) { case snd_soc_dapm_regulator_supply: - w->regulator = devm_regulator_get(dapm->dev, w->name); + w->regulator = devm_regulator_get(dapm->dev, widget->name); if (IS_ERR(w->regulator)) { ret = PTR_ERR(w->regulator); goto request_failed;