Message ID | 20221028141129.100702-1-maarten.zanders@mind.be |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp861161wru; Fri, 28 Oct 2022 07:23:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/a3+xkYqVuBp6feNz98v2mI2ZCQzgmzNsFAcQ3F9wkVnyFI4j1VSx9CTD7hnyP4DtITYZ X-Received: by 2002:a17:90b:3e88:b0:213:6442:5614 with SMTP id rj8-20020a17090b3e8800b0021364425614mr10897112pjb.58.1666967030076; Fri, 28 Oct 2022 07:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666967030; cv=none; d=google.com; s=arc-20160816; b=uSK0ZH2TOZ4bolMsd7Qa34zDWcpgLmrFWBmTv58jlSn5NfJf4VMxE/egDTKLYrKKNi eQi2TGgNbGyys1nrDKfVrNeXI355I7evprGNKBx34p36v02PZ0IURVM6tj2DiU1TYeIm q9aRp2QL2ZtHA0079BGcJTNINeIB4fWZXT/B322XhEpD8jZ085neHZz5Vlg4fuhVWkXS GiaiEkygK6ux+Em7swcrOq9qtFN1e+MQLet03/9Y/Tu/dCqNNjjXoayWuh8xx2nz0agj AYm/nOYUoAqlNDHNJ997qitf15xSmznP15Ws1VtAtLmm9fknZ54EW0oz5LswnXLJmRXJ E+yQ== 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=Sj8HqllYMhfqKSvoQNCAihSbEuI4FzdlLzmNIw46HS4=; b=YUF1mRiSDgtNft+bBdcZa52n9vLdFJjXJ+gXKq7cx026yvxD6fNKvpmh5gX3aBSYHB PIWkY+WFnxtZ27CFBmyI8AdzZA76cou+i894UnTb6ilb08sKMoKsns0NLm/yz0xGrO6V v9qxqUboiJYQKKHnA78NXcoBKHvL0Nr8CUnbgmD9QjKE0W3yeIO5LOM1gMSiU5VrP0JV xcScfpbJRe3KELnYLeVTruUMF3t7POb7JH2I61yNDEJ54hH0DOCGfhV+dtxvX5oTn0Fv jfbNzAGzO3TLYXmsTjIrM70/zTrEQ9KNlyYxnp3637d+zMbg4jyH9rTvvyiBnPX6WmkH Q1hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mind.be header.s=google header.b=aSCxH4V0; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x7-20020a1709027c0700b00172f32450b7si4658327pll.197.2022.10.28.07.23.36; Fri, 28 Oct 2022 07:23:50 -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=@mind.be header.s=google header.b=aSCxH4V0; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229776AbiJ1OMI (ORCPT <rfc822;chrisfriedt@gmail.com> + 99 others); Fri, 28 Oct 2022 10:12:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229707AbiJ1OMH (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 28 Oct 2022 10:12:07 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15C5A1C2F3C for <linux-kernel@vger.kernel.org>; Fri, 28 Oct 2022 07:12:06 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id fy4so13228680ejc.5 for <linux-kernel@vger.kernel.org>; Fri, 28 Oct 2022 07:12:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Sj8HqllYMhfqKSvoQNCAihSbEuI4FzdlLzmNIw46HS4=; b=aSCxH4V0xWhwnLfV9pMe0XfN4ID4YAlJ0P8AuJMDr8MQsLUgliJ7DKMek2AnNfLxEF +2ppRP9SBmJR4ZgjRhHXuoDFBvPUp+ysV89R+Y67dKWSM4Y0v5Dt/t0MTlKsPimJ/QvN rXO98VseuYdpDVBiRSEIcdFxJF1u7xzWzXAjUN0lmnIbuL/tgscSTCSS/fDCfT5ZkBlz cIHso4eLUO6aunBIclS8lDu4VwjxEFxQbjzuY0lRT54CvhK80AwArFkgGf+m6Qjw992p 68Nt/z1nNqEd0x9wDZYv1iSokRqTappf3lsaBaidhhkB1lvrK03uLtBMfMTGvgo4iHFF Vkbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Sj8HqllYMhfqKSvoQNCAihSbEuI4FzdlLzmNIw46HS4=; b=v9Xx/yRTZ23jA4ZobzdGGMko4Qo4VUxXu0Kr4Zsh6p7rMtdxB364DXrjeoMwibaE0C uaAon3NxvcI7Zk6U64xkYc3CItm8PyYaMvZjFkBYR4x93VPweYrEwLWXAwjuqsrfMirL DBXXlvBKrbPODtvzcBSrYbOTyBqrqmoeBzq+l1HD5gctgJcm5WH1XDjAMmXsFidWgIv4 Pufd2abBLRSNH/JSaQJx8ehaSZieM5QKWZEs5p4GDFuZHvIrwjBBBsYEoAASlfUGQ5en koDkksffL8zjGk4O4W4zHJY1mm65D4LQi9thHEo06vxDqxaq86TzfyWSx2h3xz4X2nCO vddA== X-Gm-Message-State: ACrzQf2PxGGZy3RaaLUGBbEYYujartDul7kPERCdCi1N0dvGfKfovK9E Dxl+foLm2CMqlu0uIW8oqf+GAk16qcQEp9LgZMk= X-Received: by 2002:a17:907:16a6:b0:78e:f140:a9b9 with SMTP id hc38-20020a17090716a600b0078ef140a9b9mr47339126ejc.502.1666966314346; Fri, 28 Oct 2022 07:11:54 -0700 (PDT) Received: from dtpc.zanders.be (78-22-137-109.access.telenet.be. [78.22.137.109]) by smtp.gmail.com with ESMTPSA id 9-20020a170906300900b0073d753759fasm2241902ejz.172.2022.10.28.07.11.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 07:11:53 -0700 (PDT) From: Maarten Zanders <maarten.zanders@mind.be> To: Shengjiu Wang <shengjiu.wang@gmail.com>, Xiubo Li <Xiubo.Lee@gmail.com>, Fabio Estevam <festevam@gmail.com>, Nicolin Chen <nicoleotsuka@gmail.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com> Cc: Maarten Zanders <maarten.zanders@mind.be>, alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: fsl_asrc fsl_esai fsl_sai: allow CONFIG_PM=N Date: Fri, 28 Oct 2022 16:11:28 +0200 Message-Id: <20221028141129.100702-1-maarten.zanders@mind.be> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=no 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747941620198411381?= X-GMAIL-MSGID: =?utf-8?q?1747941620198411381?= |
Series |
ASoC: fsl_asrc fsl_esai fsl_sai: allow CONFIG_PM=N
|
|
Commit Message
Maarten Zanders
Oct. 28, 2022, 2:11 p.m. UTC
When CONFIG_PM=N, pm_runtime_put_sync() returns -ENOSYS
which breaks the probe function of these drivers.
Other users of pm_runtime_put_sync() typically don't check
the return value. In order to keep the program flow as
intended, check for -ENOSYS.
This commit is similar to commit 0434d3f (omap-mailbox.c).
This commit fixes:
cab04ab (ASoC: fsl_asrc: Don't use devm_regmap_init_mmio_clk)
203773e (ASoC: fsl_esai: Don't use devm_regmap_init_mmio_clk)
2277e7e (ASoC: fsl_sai: Don't use devm_regmap_init_mmio_clk)
Signed-off-by: Maarten Zanders <maarten.zanders@mind.be>
---
sound/soc/fsl/fsl_asrc.c | 2 +-
sound/soc/fsl/fsl_esai.c | 2 +-
sound/soc/fsl/fsl_sai.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Comments
On Fri, Oct 28, 2022 at 5:37 PM Maarten Zanders <maarten.zanders@mind.be> wrote: > > When CONFIG_PM=N, pm_runtime_put_sync() returns -ENOSYS > which breaks the probe function of these drivers. > > Other users of pm_runtime_put_sync() typically don't check > the return value. In order to keep the program flow as > intended, check for -ENOSYS. > > This commit is similar to commit 0434d3f (omap-mailbox.c). > > This commit fixes: > cab04ab (ASoC: fsl_asrc: Don't use devm_regmap_init_mmio_clk) > 203773e (ASoC: fsl_esai: Don't use devm_regmap_init_mmio_clk) > 2277e7e (ASoC: fsl_sai: Don't use devm_regmap_init_mmio_clk) > > Signed-off-by: Maarten Zanders <maarten.zanders@mind.be> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
On Fri, Oct 28, 2022 at 04:11:28PM +0200, Maarten Zanders wrote: > This commit fixes: > cab04ab (ASoC: fsl_asrc: Don't use devm_regmap_init_mmio_clk) > 203773e (ASoC: fsl_esai: Don't use devm_regmap_init_mmio_clk) > 2277e7e (ASoC: fsl_sai: Don't use devm_regmap_init_mmio_clk) Please use 12 character hashes for disambiguation.
On Fri, 28 Oct 2022 16:11:28 +0200, Maarten Zanders wrote: > When CONFIG_PM=N, pm_runtime_put_sync() returns -ENOSYS > which breaks the probe function of these drivers. > > Other users of pm_runtime_put_sync() typically don't check > the return value. In order to keep the program flow as > intended, check for -ENOSYS. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: fsl_asrc fsl_esai fsl_sai: allow CONFIG_PM=N commit: 6a564338a23cefcfc29c4a535b98402d13efdda6 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 44dcbf49456c..08ca410ef551 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -1226,7 +1226,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) } ret = pm_runtime_put_sync(&pdev->dev); - if (ret < 0) + if (ret < 0 && ret != -ENOSYS) goto err_pm_get_sync; ret = devm_snd_soc_register_component(&pdev->dev, &fsl_asrc_component, diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index bda66b30e063..763f5f0592af 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -1070,7 +1070,7 @@ static int fsl_esai_probe(struct platform_device *pdev) regmap_write(esai_priv->regmap, REG_ESAI_RSMB, 0); ret = pm_runtime_put_sync(&pdev->dev); - if (ret < 0) + if (ret < 0 && ret != -ENOSYS) goto err_pm_get_sync; /* diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 38f6362099d5..01f3463c0e47 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -1149,7 +1149,7 @@ static int fsl_sai_probe(struct platform_device *pdev) } ret = pm_runtime_put_sync(dev); - if (ret < 0) + if (ret < 0 && ret != -ENOSYS) goto err_pm_get_sync; /*