From patchwork Fri Oct 28 17:34:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Zanders X-Patchwork-Id: 12498 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp958106wru; Fri, 28 Oct 2022 10:38:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7bKJU0E7E59hGzg5mzTl/Iz9dktrAarC9UCDoMFhJstmypWhTHb4xwFk8MFqWZHK+8ESxY X-Received: by 2002:a17:906:9be6:b0:7ad:a73b:40c7 with SMTP id de38-20020a1709069be600b007ada73b40c7mr415796ejc.483.1666978704224; Fri, 28 Oct 2022 10:38:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666978704; cv=none; d=google.com; s=arc-20160816; b=MA1eYno2vMY6u/Wo0Xv6BneQlG8RyspgSa6SXgaYLhg30G0k9p2P3rfEYhu9uMXyVD X3BjaSuH/zLcp9AvKCOHkvMt3PjeTBx9rJn9CRn7XHIjnJ+jbrDCkKaEdNF7qQhwdcpH GP9qbx04tAa6X44aTaUQ5HVYtuaKpM/dJwU0buLL+OMZaVsm5YAz4aCMGgsQkrwgphzD mVHw/3oXBk2y8dYbi5I21FEW9cZ/WxMQYMRf5IbX49KEWa3bZj0uRDoRQPOMpyPHi1Z7 POuB3aIqECXWn8kwRrr7zA6uEqR/EFrE3csAWBymozki7UktqxoIvNGkeA9qEU24dFS6 eMGQ== 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=HXgFQ2AiirDn7ylvDdK02G7QYybBypCEVhzqiAXGlxg=; b=rCLqygLMkEShHZPXjwFlmKtfvuL1X+fGVa/tG2WJQ39sS1XX74/hEyae6e9BB3Rs44 2PKduXQTPEZ0yZQkmbQv/tAm9oPmvlCpWxrQS6kqbjXlCwhgR4Eok2UCJSHpLft6TAkI Vu7XzJH0czfDXpScNz/MkLCQyuT0mVyCDk2CWow5MAhFR94uiEs/wEEaaWjgkyvNvAvq Ri0zpjTBit0murSc5v+l6SjmHfPJJX1TwfHyWMi6GavtuScmgm0qGyFzZUue4fK4EDgD sYxA585diWwJoF+rTBzF0GQSl2h32wO3KSaYJgm2hReSNUAWPgMJqkdfR7dkm7Gf/OF3 nXig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mind.be header.s=google header.b=Scyhmj02; 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 gn12-20020a1709070d0c00b0078fcfc5d24esi6305532ejc.618.2022.10.28.10.38.01; Fri, 28 Oct 2022 10:38:24 -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=Scyhmj02; 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 S229906AbiJ1ReY (ORCPT + 99 others); Fri, 28 Oct 2022 13:34:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229602AbiJ1ReX (ORCPT ); Fri, 28 Oct 2022 13:34:23 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05C39229E75 for ; Fri, 28 Oct 2022 10:34:22 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id n12so14513918eja.11 for ; Fri, 28 Oct 2022 10:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; 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=HXgFQ2AiirDn7ylvDdK02G7QYybBypCEVhzqiAXGlxg=; b=Scyhmj02CKM5yxBdbaYtrAYm1fwrxtc4tLIwSA/sRtHag12CtQy2AjaU2237oxsWZZ lop/DZe74+wPugi3WBwjHcSgWRIREq0aoa4BTgpCdh3eHEuFzCY4/zGdiV6W8Z5AbIRM QEAqkNt2Xj5VweRGQyCNodWQ2cr69+tVh7giqmXV+LKeahpntt6CD8KkTPWShlb1sbP3 XpDdj7ZUkpc8KQggPzg9gv0H8NBq3KnP6z6toMt5HXEPZNtVK1fw1qTPWBE2X5srE+Bs vmJMbhn5+FgUDKrMLXZASwoAkXQGud+D3HMBxb0SUqHgIPpo2kG8HOUSGpdrOzXVjxxK h0cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=HXgFQ2AiirDn7ylvDdK02G7QYybBypCEVhzqiAXGlxg=; b=yTx/VuoRQzN8MHCsII5RRKvA/r3qGIuUDnmXLtK9OgmoDixFtbPdQION9tz/HMsLS8 NTRA+hi19NGCiof6BuetVzE3wY1//pKBclGsgWi3LgTp8ltEBk2NSzA0qKGliGEGzASS KShSTzRjZRu+2GfG6r/tuDunTCv5c4wymA/rcpU2xVVxMTr1pwtjwwmX23M7txAkdsPV AhNpI63sQduqeSe9sR8ycSDGGfy6BotorCJs3jTGHy2FKVerhk3pHt/WnOMGT1sh9rCT 3UYjzVpyWS8O1eO6fYSlABuKseyDI/OfVUwn2XDTlJvd4z7ZVnFkWaUfhbkpUqZdqizB JEjA== X-Gm-Message-State: ACrzQf0DeFMAHF/0EmeDq2b9oHiY0GfMOj/vJ2VDJJ+qo+GprfDpgK0R NaorKQujseswYomBZLq6PgWHbw== X-Received: by 2002:a17:907:3da2:b0:78d:3b45:11d9 with SMTP id he34-20020a1709073da200b0078d3b4511d9mr407191ejc.87.1666978460491; Fri, 28 Oct 2022 10:34:20 -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 v8-20020a170906b00800b0078dce9984afsm2388868ejy.220.2022.10.28.10.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 10:34:20 -0700 (PDT) From: Maarten Zanders To: Shengjiu Wang , Xiubo Li , Fabio Estevam , Nicolin Chen , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: Maarten Zanders , Daniel Baluta , alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] ASoC: fsl_asrc fsl_esai fsl_sai: allow CONFIG_PM=N Date: Fri, 28 Oct 2022 19:34:04 +0200 Message-Id: <20221028173405.155264-1-maarten.zanders@mind.be> X-Mailer: git-send-email 2.37.3 In-Reply-To: References: MIME-Version: 1.0 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: 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?1747953861815135585?= 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 0434d3f4525a ("mailbox/omap: Handle if CONFIG_PM is disabled") This commit fixes commit cab04ab5900f ("ASoC: fsl_asrc: Don't use devm_regmap_init_mmio_clk") commit 203773e39347 ("ASoC: fsl_esai: Don't use devm_regmap_init_mmio_clk") commit 2277e7e36b4b ("ASoC: fsl_sai: Don't use devm_regmap_init_mmio_clk") Signed-off-by: Maarten Zanders Reviewed-by: Daniel Baluta --- 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(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 936aef5d2767..e16e7b3fa96c 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -1232,7 +1232,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 5c21fc490fce..17fefd27ec90 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -1069,7 +1069,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 81f89f6767a2..e60c7b344562 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -1446,7 +1446,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; /*