]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
firmware: mtk-adsp-ipc: Switch to using dev_err_probe()
authorAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Thu, 19 Sep 2024 12:02:08 +0000 (14:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Oct 2024 15:12:54 +0000 (17:12 +0200)
There is an error path that checks whether the return value is
-EPROBE_DEFER to decide whether to print the error message: that
is exactly open-coding dev_err_probe(), so, switch to that.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20240919120208.152987-1-angelogioacchino.delregno@collabora.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/firmware/mtk-adsp-ipc.c

index a762302978de0f9fa3bdea869e1a99dcdc79cc45..fdb083f42ebf389ef8a861abad94557913810ed0 100644 (file)
@@ -95,10 +95,9 @@ static int mtk_adsp_ipc_probe(struct platform_device *pdev)
                adsp_chan->idx = i;
                adsp_chan->ch = mbox_request_channel_byname(cl, adsp_mbox_ch_names[i]);
                if (IS_ERR(adsp_chan->ch)) {
-                       ret = PTR_ERR(adsp_chan->ch);
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(dev, "Failed to request mbox chan %s ret %d\n",
-                                       adsp_mbox_ch_names[i], ret);
+                       ret = dev_err_probe(dev, PTR_ERR(adsp_chan->ch),
+                                           "Failed to request mbox channel %s\n",
+                                           adsp_mbox_ch_names[i]);
 
                        for (j = 0; j < i; j++) {
                                adsp_chan = &adsp_ipc->chans[j];