Re: [PATCH 1/2] serial: amba-pl011: Remove redundant label

[Daniel Thompson]

On 23/06/14 06:59, Tushar Behera wrote:
> The label 'out' is only used to return the error code. We can return the
> error code directly and remove 'out' label.
> 
> Signed-off-by: Tushar Behera <tushar.b@xxxxxxxxxxx>
> ---
>  drivers/tty/serial/amba-pl011.c |   30 ++++++++++--------------------
>  1 file changed, 10 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
> index 0e26dcb..8572f2a 100644
> --- a/drivers/tty/serial/amba-pl011.c
> +++ b/drivers/tty/serial/amba-pl011.c
> @@ -1484,7 +1484,7 @@ static int pl011_hwinit(struct uart_port *port)
>  	 */
>  	retval = clk_prepare_enable(uap->clk);
>  	if (retval)
> -		goto out;
> +		return retval;
>  
>  	uap->port.uartclk = clk_get_rate(uap->clk);
>  
> @@ -1507,8 +1507,6 @@ static int pl011_hwinit(struct uart_port *port)
>  			plat->init();
>  	}
>  	return 0;
> - out:
> -	return retval;
>  }
>  
>  static void pl011_write_lcr_h(struct uart_amba_port *uap, unsigned int lcr_h)
> @@ -2131,32 +2129,24 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
>  		if (amba_ports[i] == NULL)
>  			break;
>  
> -	if (i == ARRAY_SIZE(amba_ports)) {
> -		ret = -EBUSY;
> -		goto out;
> -	}
> +	if (i == ARRAY_SIZE(amba_ports))
> +		return -EBUSY;
>  
>  	uap = devm_kzalloc(&dev->dev, sizeof(struct uart_amba_port),
>  			   GFP_KERNEL);
> -	if (uap == NULL) {
> -		ret = -ENOMEM;
> -		goto out;
> -	}
> +	if (uap == NULL)
> +		return -ENOMEM;
>  
>  	i = pl011_probe_dt_alias(i, &dev->dev);
>  
>  	base = devm_ioremap(&dev->dev, dev->res.start,
>  			    resource_size(&dev->res));
> -	if (!base) {
> -		ret = -ENOMEM;
> -		goto out;
> -	}
> +	if (!base)
> +		return -ENOMEM;
>  
>  	uap->clk = devm_clk_get(&dev->dev, NULL);
> -	if (IS_ERR(uap->clk)) {
> -		ret = PTR_ERR(uap->clk);
> -		goto out;
> -	}
> +	if (IS_ERR(uap->clk))
> +		return PTR_ERR(uap->clk);
>  
>  	uap->vendor = vendor;
>  	uap->lcrh_rx = vendor->lcrh_rx;
> @@ -2198,7 +2188,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
>  		uart_unregister_driver(&amba_reg);
>  		pl011_dma_remove(uap);
>  	}
> - out:
> +
>  	return ret;
>  }

Reviewed-by: Daniel Thompson <daniel.thompson@xxxxxxxxxx>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/