Merge tag 'vfs-5.10-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / drivers / pwm / pwm-bcm2835.c

diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c
index d78f86f..6841dcf 100644 (file)
--- a/drivers/pwm/pwm-bcm2835.c
+++ b/drivers/pwm/pwm-bcm2835.c
@@ -152,13 +152,9 @@ static int bcm2835_pwm_probe(struct platform_device *pdev)
                return PTR_ERR(pc->base);
 
        pc->clk = devm_clk_get(&pdev->dev, NULL);
-       if (IS_ERR(pc->clk)) {
-               ret = PTR_ERR(pc->clk);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "clock not found: %d\n", ret);
-
-               return ret;
-       }
+       if (IS_ERR(pc->clk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk),
+                                    "clock not found\n");
 
        ret = clk_prepare_enable(pc->clk);
        if (ret)