Re: [PATCH 1/2] serial: 8250: Simplify with dev_err_probe()

2020-09-02 Thread Lukas Wunner 
On Tue, Sep 01, 2020 at 05:30:59PM +0200, Krzysztof Kozlowski wrote:
> Common pattern of handling deferred probe can be simplified with
> dev_err_probe().  Less code and the error value gets printed.
> 
> Signed-off-by: Krzysztof Kozlowski 

Reviewed-by: Lukas Wunner

[PATCH 1/2] serial: 8250: Simplify with dev_err_probe()

2020-09-01 Thread Krzysztof Kozlowski 
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: Krzysztof Kozlowski 
---
 drivers/tty/serial/8250/8250_bcm2835aux.c | 12 +++-
 drivers/tty/serial/8250/8250_ingenic.c| 20 ++--
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c 
b/drivers/tty/serial/8250/8250_bcm2835aux.c
index 12d03e678295..fd95860cd661 100644
--- a/drivers/tty/serial/8250/8250_bcm2835aux.c
+++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
@@ -110,12 +110,8 @@ static int bcm2835aux_serial_probe(struct platform_device 
*pdev)
 
/* get the clock - this also enables the HW */
data->clk = devm_clk_get(>dev, NULL);
-   ret = PTR_ERR_OR_ZERO(data->clk);
-   if (ret) {
-   if (ret != -EPROBE_DEFER)
-   dev_err(>dev, "could not get clk: %d\n", ret);
-   return ret;
-   }
+   if (IS_ERR(data->clk))
+   return dev_err_probe(>dev, PTR_ERR(data->clk), "could not 
get clk\n");
 
/* get the interrupt */
ret = platform_get_irq(pdev, 0);
@@ -155,9 +151,7 @@ static int bcm2835aux_serial_probe(struct platform_device 
*pdev)
/* register the port */
ret = serial8250_register_8250_port();
if (ret < 0) {
-   if (ret != -EPROBE_DEFER)
-   dev_err(>dev,
-   "unable to register 8250 port - %d\n", ret);
+   dev_err_probe(>dev, ret, "unable to register 8250 
port\n");
goto dis_clk;
}
data->line = ret;
diff --git a/drivers/tty/serial/8250/8250_ingenic.c 
b/drivers/tty/serial/8250/8250_ingenic.c
index dde766fa465f..988bf6bcce42 100644
--- a/drivers/tty/serial/8250/8250_ingenic.c
+++ b/drivers/tty/serial/8250/8250_ingenic.c
@@ -259,22 +259,14 @@ static int ingenic_uart_probe(struct platform_device 
*pdev)
return -ENOMEM;
 
data->clk_module = devm_clk_get(>dev, "module");
-   if (IS_ERR(data->clk_module)) {
-   err = PTR_ERR(data->clk_module);
-   if (err != -EPROBE_DEFER)
-   dev_err(>dev,
-   "unable to get module clock: %d\n", err);
-   return err;
-   }
+   if (IS_ERR(data->clk_module))
+   return dev_err_probe(>dev, PTR_ERR(data->clk_module),
+"unable to get module clock\n");
 
data->clk_baud = devm_clk_get(>dev, "baud");
-   if (IS_ERR(data->clk_baud)) {
-   err = PTR_ERR(data->clk_baud);
-   if (err != -EPROBE_DEFER)
-   dev_err(>dev,
-   "unable to get baud clock: %d\n", err);
-   return err;
-   }
+   if (IS_ERR(data->clk_baud))
+   return dev_err_probe(>dev, PTR_ERR(data->clk_baud),
+"unable to get baud clock\n");
 
err = clk_prepare_enable(data->clk_module);
if (err) {
-- 
2.17.1

Re: [PATCH 1/2] serial: 8250: Simplify with dev_err_probe()

2020-09-01 Thread Florian Fainelli 




On 9/1/2020 8:30 AM, Krzysztof Kozlowski wrote:

Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: Krzysztof Kozlowski 
---
  drivers/tty/serial/8250/8250_bcm2835aux.c | 12 +++-
  drivers/tty/serial/8250/8250_ingenic.c| 20 ++--
  2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c 
b/drivers/tty/serial/8250/8250_bcm2835aux.c
index 12d03e678295..fd95860cd661 100644
--- a/drivers/tty/serial/8250/8250_bcm2835aux.c
+++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
@@ -110,12 +110,8 @@ static int bcm2835aux_serial_probe(struct platform_device 
*pdev)
  
  	/* get the clock - this also enables the HW */

data->clk = devm_clk_get(>dev, NULL);
-   ret = PTR_ERR_OR_ZERO(data->clk);
-   if (ret) {
-   if (ret != -EPROBE_DEFER)
-   dev_err(>dev, "could not get clk: %d\n", ret);
-   return ret;
-   }
+   if (IS_ERR(data->clk))
+   return dev_err_probe(>dev, PTR_ERR(data->clk), "could not get 
clk\n");


For 8250_bcm2835aux.c:

Acked-by: Florian Fainelli 
--
Florian