serial: 8250: Simplify with dev_err_probe()
Subsystems (4)
PATCH 2/2 serial: core: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
--- drivers/tty/serial/serial_core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/tty/serial/serial_core.c +1 -3
@@ -3264,9 +3264,7 @@ int uart_get_rs485_mode(struct uart_port *port)if (IS_ERR (port->rs485_term_gpio)) { ret =PTR_ERR (port->rs485_term_gpio); port->rs485_term_gpio =NULL ; -if (ret != -EPROBE_DEFER ) -dev_err (dev,"Cannot get rs485-term-gpios\n" ); -return ret; +return dev_err_probe (dev, ret,"Cannot get rs485-term-gpios\n" ); }return 0 ;
Signature · 1 line
2.17.1
PATCH 1/2 serial: 8250: Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
--- drivers/tty/serial/8250/8250_bcm2835aux.c | 12 +++--------- drivers/tty/serial/8250/8250_ingenic.c | 20 ++++++-------------- 2 files changed, 9 insertions(+), 23 deletions(-)
drivers/tty/serial/8250/8250_bcm2835aux.c +3 -9
@@ -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 (&pdev->dev,NULL ); - ret =PTR_ERR_OR_ZERO (data->clk); -if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (&pdev->dev,"could not get clk: %d\n" , ret); -return ret; - } +if (IS_ERR (data->clk)) +return dev_err_probe (&pdev->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 (&up);if (ret <0 ) { -if (ret != -EPROBE_DEFER ) -dev_err (&pdev->dev, -"unable to register 8250 port - %d\n" , ret); +dev_err_probe (&pdev->dev, ret,"unable to register 8250 port\n" ); goto dis_clk; } data->line = ret;
drivers/tty/serial/8250/8250_ingenic.c +6 -14
@@ -259,22 +259,14 @@ static int ingenic_uart_probe(struct platform_device *pdev)return -ENOMEM ; data->clk_module =devm_clk_get (&pdev->dev,"module" ); -if (IS_ERR (data->clk_module)) { - err =PTR_ERR (data->clk_module); -if (err != -EPROBE_DEFER ) -dev_err (&pdev->dev, -"unable to get module clock: %d\n" , err); -return err; - } +if (IS_ERR (data->clk_module)) +return dev_err_probe (&pdev->dev,PTR_ERR (data->clk_module), +"unable to get module clock\n" ); data->clk_baud =devm_clk_get (&pdev->dev,"baud" ); -if (IS_ERR (data->clk_baud)) { - err =PTR_ERR (data->clk_baud); -if (err != -EPROBE_DEFER ) -dev_err (&pdev->dev, -"unable to get baud clock: %d\n" , err); -return err; - } +if (IS_ERR (data->clk_baud)) +return dev_err_probe (&pdev->dev,PTR_ERR (data->clk_baud), +"unable to get baud clock\n" ); err =clk_prepare_enable (data->clk_module);if (err) {
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 15 lines · 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 <[email protected]>--- drivers/tty/serial/8250/8250_bcm2835aux.c | 12 +++--------- drivers/tty/serial/8250/8250_ingenic.c | 20 ++++++-------------- 2 files changed, 9 insertions(+), 23 deletions(-)drivers/tty/serial/8250/8250_bcm2835aux.c +0
-0@@ -110,12 +110,8 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev)
drivers/tty/serial/8250/8250_bcm2835aux.c static int bcm2835aux_serial_probe(struct platform_device *pdev) · line 114
Quoted 10 lines
drivers/tty/serial/8250/8250_bcm2835aux.c +2
-6/* get the clock - this also enables the HW */ data->clk =devm_clk_get (&pdev->dev,NULL ); - ret =PTR_ERR_OR_ZERO (data->clk); -if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (&pdev->dev,"could not get clk: %d\n" , ret); -return ret; - } +if (IS_ERR (data->clk)) +return dev_err_probe (&pdev->dev,PTR_ERR (data->clk),"could not get clk\n" );
For 8250_bcm2835aux.c:
Signature · 1 line
Florian
Re: [PATCH 2/2] serial: core: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 4 lines · 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 <[email protected]>
Quoted 4 lines · 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 <[email protected]>