| Message ID | 1623165248-24038-1-git-send-email-zpershuai@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | spi: spi-at91-usart: Fix wrong goto jump label when spi_alloc_master() returns error. | expand |
On 08/06/2021 23:14:07+0800, 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. > > Signed-off-by: zpershuai <zpershuai@gmail.com> > --- > drivers/spi/spi-at91-usart.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c > index 8c83526..c8136dc 100644 > --- a/drivers/spi/spi-at91-usart.c > +++ b/drivers/spi/spi-at91-usart.c > @@ -533,8 +533,10 @@ static int at91_usart_spi_probe(struct platform_device *pdev) > > ret = -ENOMEM; > controller = spi_alloc_master(&pdev->dev, sizeof(*aus)); > - if (!controller) > - goto at91_usart_spi_probe_fail; > + if (!controller) { > + dev_err(&pdev->dev, "Error allocating SPI controller\n"); > + return -ENOMEM; > + } size before this patch: text data bss dec hex filename 3659 112 0 3771 ebb drivers/spi/spi-at91-usart.o size after: text data bss dec hex filename 3671 112 0 3783 ec7 drivers/spi/spi-at91-usart.o Please avoid adding useless error strings in the kernel. This will never fail and if for some reason this fails an error message would already be printed anyway. Strings take space on the storage, increase boot time and RAM usage.
diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c index 8c83526..c8136dc 100644 --- a/drivers/spi/spi-at91-usart.c +++ b/drivers/spi/spi-at91-usart.c @@ -533,8 +533,10 @@ static int at91_usart_spi_probe(struct platform_device *pdev) ret = -ENOMEM; controller = spi_alloc_master(&pdev->dev, sizeof(*aus)); - if (!controller) - goto at91_usart_spi_probe_fail; + if (!controller) { + dev_err(&pdev->dev, "Error allocating SPI controller\n"); + return -ENOMEM; + } ret = at91_usart_gpio_setup(pdev); if (ret)
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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)