2014-06-23 06:05:27

by Tushar Behera

Subject: [PATCH] serial: samsung: Remove redundant label

probe_err label only returns the error code. This label can be removed
and the error code can be returned directly.

Signed-off-by: Tushar Behera <[email protected]>
---
drivers/tty/serial/samsung.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index c1d3ebd..bf93010 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1303,7 +1303,7 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)

ret = s3c24xx_serial_init_port(ourport, pdev);
if (ret < 0)
- goto probe_err;
+ return ret;

if (!s3c24xx_uart_drv.state) {
ret = uart_register_driver(&s3c24xx_uart_drv);
@@ -1335,9 +1335,6 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "failed to add cpufreq notifier\n");

return 0;
-
- probe_err:
- return ret;
}

static int s3c24xx_serial_remove(struct platform_device *dev)
--
1.7.9.5

2014-06-23 06:12:20

by Sachin Kamat

Subject: Re: [PATCH] serial: samsung: Remove redundant label

On Mon, Jun 23, 2014 at 11:32 AM, Tushar Behera <[email protected]> wrote:
> probe_err label only returns the error code. This label can be removed
> and the error code can be returned directly.
>
> Signed-off-by: Tushar Behera <[email protected]>
> ---
> drivers/tty/serial/samsung.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
> index c1d3ebd..bf93010 100644
> --- a/drivers/tty/serial/samsung.c
> +++ b/drivers/tty/serial/samsung.c
> @@ -1303,7 +1303,7 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)
>
> ret = s3c24xx_serial_init_port(ourport, pdev);
> if (ret < 0)
> - goto probe_err;
> + return ret;
>
> if (!s3c24xx_uart_drv.state) {
> ret = uart_register_driver(&s3c24xx_uart_drv);
> @@ -1335,9 +1335,6 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)
> dev_err(&pdev->dev, "failed to add cpufreq notifier\n");
>
> return 0;
> -
> - probe_err:
> - return ret;
> }
>
> static int s3c24xx_serial_remove(struct platform_device *dev)
> --

Looks good.
Reviewed-by: Sachin Kamat <[email protected]>