diff mbox series

[v2] spi: spi-at91-usart: Fix wrong goto jump label when spi_alloc_master() returns error.

Message ID 1623206895-8282-1-git-send-email-zpershuai@gmail.com (mailing list archive)
State New
Headers show
Series [v2] spi: spi-at91-usart: Fix wrong goto jump label when spi_alloc_master() returns error. | expand

Commit Message

zpershuai June 9, 2021, 2:48 a.m. UTC
When spi_alloc_master() returns null pointer, it’s no need to use
spi_master_put() to release the memory, although spi_master_put()
function has null pointer checks.

Signed-off-by: zpershuai <zpershuai@gmail.com>
---
 drivers/spi/spi-at91-usart.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Nicolas Ferre June 9, 2021, 8 a.m. UTC | #1
On 09/06/2021 at 04:48, zpershuai wrote:
> When spi_alloc_master() returns null pointer, it’s no need to use
> spi_master_put() to release the memory, although spi_master_put()
> function has null pointer checks.

So, I don't see the benefit in changing then.
at91_usart_spi_probe_fail label is nicely unified across the probe 
function and having it called once more or once less is no interest to me.

Sorry but NACK until someone persuades me it's needed or common pattern 
among spi drivers.

Regards,
   Nicolas

> Signed-off-by: zpershuai <zpershuai@gmail.com>
> ---
>   drivers/spi/spi-at91-usart.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c
> index 8c83526..e5c2d2c 100644
> --- a/drivers/spi/spi-at91-usart.c
> +++ b/drivers/spi/spi-at91-usart.c
> @@ -531,10 +531,9 @@ static int at91_usart_spi_probe(struct platform_device *pdev)
>          if (IS_ERR(clk))
>                  return PTR_ERR(clk);
> 
> -       ret = -ENOMEM;
>          controller = spi_alloc_master(&pdev->dev, sizeof(*aus));
>          if (!controller)
> -               goto at91_usart_spi_probe_fail;
> +               return -ENOMEM;
> 
>          ret = at91_usart_gpio_setup(pdev);
>          if (ret)
> --
> 2.7.4
>
diff mbox series

Patch

diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c
index 8c83526..e5c2d2c 100644
--- a/drivers/spi/spi-at91-usart.c
+++ b/drivers/spi/spi-at91-usart.c
@@ -531,10 +531,9 @@  static int at91_usart_spi_probe(struct platform_device *pdev)
 	if (IS_ERR(clk))
 		return PTR_ERR(clk);
 
-	ret = -ENOMEM;
 	controller = spi_alloc_master(&pdev->dev, sizeof(*aus));
 	if (!controller)
-		goto at91_usart_spi_probe_fail;
+		return -ENOMEM;
 
 	ret = at91_usart_gpio_setup(pdev);
 	if (ret)