serial: sh-sci: Use dev_err_probe()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 16 Dec 2021 14:17:33 +0000 (15:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Dec 2021 16:57:15 +0000 (17:57 +0100)
Use the dev_err_probe() helper to streamline error handling.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/5c4dd8df1f8d0d14786f26ee80b77f3eb8e06cd5.1639663832.git.geert+renesas@glider.be
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sh-sci.c

index f63b5a6..9b4afbb 100644 (file)
@@ -2790,15 +2790,12 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
                         * global "peripheral_clk" clock.
                         */
                        clk = devm_clk_get(dev, "peripheral_clk");
-                       if (!IS_ERR(clk))
-                               goto found;
-
-                       dev_err(dev, "failed to get %s (%ld)\n", clk_names[i],
-                               PTR_ERR(clk));
-                       return PTR_ERR(clk);
+                       if (IS_ERR(clk))
+                               return dev_err_probe(dev, PTR_ERR(clk),
+                                                    "failed to get %s\n",
+                                                    clk_names[i]);
                }
 
-found:
                if (IS_ERR(clk))
                        dev_dbg(dev, "failed to get %s (%ld)\n", clk_names[i],
                                PTR_ERR(clk));