From nobody Sat Apr 11 19:43:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDF7AC25B0C for ; Sun, 7 Aug 2022 20:19:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231224AbiHGUTE (ORCPT ); Sun, 7 Aug 2022 16:19:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230386AbiHGUTB (ORCPT ); Sun, 7 Aug 2022 16:19:01 -0400 Received: from smtp.smtpout.orange.fr (smtp-14.smtpout.orange.fr [80.12.242.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4108614D for ; Sun, 7 Aug 2022 13:18:59 -0700 (PDT) Received: from pop-os.home ([90.11.190.129]) by smtp.orange.fr with ESMTPA id Kmjfo2a6aEkSDKmjfoUec8; Sun, 07 Aug 2022 22:18:57 +0200 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Sun, 07 Aug 2022 22:18:57 +0200 X-ME-IP: 90.11.190.129 From: Christophe JAILLET To: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Mark Brown , Jaroslav Kysela , Takashi Iwai , Harsha Priya , "Subhransu S. Prusty" , Vinod Koul , Sriram Periyasamy Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , alsa-devel@alsa-project.org Subject: [PATCH] ASoC: Intel: kbl_rt5663_max98927: Simplify clk_get() usage Date: Sun, 7 Aug 2022 22:18:54 +0200 Message-Id: <55e59c4792d64ff6336fcaa85ec15590553e9d63.1659903516.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If clk_get() returns -ENOENT, there is no need to defer the driver, -ENOENT will be returned the same for each retries. So, return the error code directly instead of -EPROBE_DEFER. Remove this special case and use dev_err_probe() to simplify code. It will also be less verbose if the clk is really deferred. Fixes: f7f61e08fe58 ("ASoC: Intel: kbl: Enable mclk and ssp sclk early") Signed-off-by: Christophe JAILLET --- This is based on my understanding of clk_get(). Review with care. Not sure the Fixes tag is needed. The patch does not fix anything. If devm_clk_get() returns -ENOENT, it will just loop several time until the framework gives up. If it returns -EPROBE_DEFER, this case is already handled by the "return ret;" So this patch should be a no-op, just a clean-up. --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 31 ++++---------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel= /boards/kbl_rt5663_max98927.c index 2d4224c5b152..07b00af2fa3c 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -989,7 +989,6 @@ static int kabylake_audio_probe(struct platform_device = *pdev) { struct kbl_rt5663_private *ctx; struct snd_soc_acpi_mach *mach; - int ret; =20 ctx =3D devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -1009,32 +1008,14 @@ static int kabylake_audio_probe(struct platform_dev= ice *pdev) &constraints_dmic_2ch : &constraints_dmic_channels; =20 ctx->mclk =3D devm_clk_get(&pdev->dev, "ssp1_mclk"); - if (IS_ERR(ctx->mclk)) { - ret =3D PTR_ERR(ctx->mclk); - if (ret =3D=3D -ENOENT) { - dev_info(&pdev->dev, - "Failed to get ssp1_sclk, defer probe\n"); - return -EPROBE_DEFER; - } - - dev_err(&pdev->dev, "Failed to get ssp1_mclk with err:%d\n", - ret); - return ret; - } + if (IS_ERR(ctx->mclk)) + return dev_err_probe(&pdev->dev, PTR_ERR(ctx->mclk), + "Failed to get ssp1_mclk\n"); =20 ctx->sclk =3D devm_clk_get(&pdev->dev, "ssp1_sclk"); - if (IS_ERR(ctx->sclk)) { - ret =3D PTR_ERR(ctx->sclk); - if (ret =3D=3D -ENOENT) { - dev_info(&pdev->dev, - "Failed to get ssp1_sclk, defer probe\n"); - return -EPROBE_DEFER; - } - - dev_err(&pdev->dev, "Failed to get ssp1_sclk with err:%d\n", - ret); - return ret; - } + if (IS_ERR(ctx->sclk)) + return dev_err_probe(&pdev->dev, PTR_ERR(ctx->sclk), + "Failed to get ssp1_sclk\n"); =20 return devm_snd_soc_register_card(&pdev->dev, kabylake_audio_card); } --=20 2.34.1