firmware: turris-mox-rwtm: Use dev_err_probe() where possible
authorMarek Behún <kabel@kernel.org>
Sat, 31 Aug 2024 09:20:44 +0000 (11:20 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 2 Sep 2024 09:42:10 +0000 (09:42 +0000)
Use dev_err_probe() where possible in the driver's .probe() method.

Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20240831092050.23093-11-kabel@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/firmware/turris-mox-rwtm.c

index dd0dbaa..f291df9 100644 (file)
@@ -459,13 +459,9 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev)
        rwtm->mbox_client.rx_callback = mox_rwtm_rx_callback;
 
        rwtm->mbox = mbox_request_channel(&rwtm->mbox_client, 0);
-       if (IS_ERR(rwtm->mbox)) {
-               ret = PTR_ERR(rwtm->mbox);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "Cannot request mailbox channel: %i\n",
-                               ret);
-               return ret;
-       }
+       if (IS_ERR(rwtm->mbox))
+               return dev_err_probe(dev, PTR_ERR(rwtm->mbox),
+                                    "Cannot request mailbox channel!\n");
 
        ret = devm_add_action_or_reset(dev, rwtm_devm_mbox_release, rwtm->mbox);
        if (ret)
@@ -487,10 +483,8 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev)
        rwtm->hwrng.priv = (unsigned long) rwtm;
 
        ret = devm_hwrng_register(dev, &rwtm->hwrng);
-       if (ret < 0) {
-               dev_err(dev, "Cannot register HWRNG: %i\n", ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Cannot register HWRNG!\n");
 
        rwtm_register_debugfs(rwtm);