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: 47cbea216281 ("ASoC: Intel: eve: Enable mclk and ssp sclk early") Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr --- 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. --- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 31 ++++--------------- 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 2c79fca57b19..e23001ca2d04 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -798,7 +798,6 @@ static int kabylake_audio_probe(struct platform_device *pdev) { struct kbl_codec_private *ctx; struct snd_soc_acpi_mach *mach; - int ret;

ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -815,32 +814,14 @@ static int kabylake_audio_probe(struct platform_device *pdev) &constraints_dmic_2ch : &constraints_dmic_channels;

ctx->mclk = devm_clk_get(&pdev->dev, "ssp1_mclk"); - if (IS_ERR(ctx->mclk)) { - ret = PTR_ERR(ctx->mclk); - if (ret == -ENOENT) { - dev_info(&pdev->dev, - "Failed to get ssp1_mclk, 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");

ctx->sclk = devm_clk_get(&pdev->dev, "ssp1_sclk"); - if (IS_ERR(ctx->sclk)) { - ret = PTR_ERR(ctx->sclk); - if (ret == -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");

return devm_snd_soc_register_card(&pdev->dev, &kabylake_audio_card); }