lkml.org 
[lkml]   [2022]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH -next v2 2/3] spi: microchip-core: switch to use devm_spi_alloc_master()
Date
Switch to use devm_spi_alloc_master() to simpify error path.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/spi/spi-microchip-core.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c
index c26767343176..1a24e47f8305 100644
--- a/drivers/spi/spi-microchip-core.c
+++ b/drivers/spi/spi-microchip-core.c
@@ -513,7 +513,7 @@ static int mchp_corespi_probe(struct platform_device *pdev)
u32 num_cs;
int ret = 0;

- master = spi_alloc_master(&pdev->dev, sizeof(*spi));
+ master = devm_spi_alloc_master(&pdev->dev, sizeof(*spi));
if (!master)
return dev_err_probe(&pdev->dev, -ENOMEM,
"unable to allocate master for SPI controller\n");
@@ -535,36 +535,32 @@ static int mchp_corespi_probe(struct platform_device *pdev)
spi = spi_master_get_devdata(master);

spi->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
- if (IS_ERR(spi->regs)) {
- ret = PTR_ERR(spi->regs);
- goto error_release_master;
- }
+ if (IS_ERR(spi->regs))
+ return PTR_ERR(spi->regs);

spi->irq = platform_get_irq(pdev, 0);
if (spi->irq <= 0) {
dev_err(&pdev->dev, "invalid IRQ %d for SPI controller\n", spi->irq);
- ret = -ENXIO;
- goto error_release_master;
+ return -ENXIO;
}

ret = devm_request_irq(&pdev->dev, spi->irq, mchp_corespi_interrupt,
IRQF_SHARED, dev_name(&pdev->dev), master);
if (ret) {
dev_err(&pdev->dev, "could not request irq: %d\n", ret);
- goto error_release_master;
+ return ret;
}

spi->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(spi->clk)) {
- ret = PTR_ERR(spi->clk);
dev_err(&pdev->dev, "could not get clk: %d\n", ret);
- goto error_release_master;
+ return PTR_ERR(spi->clk);
}

ret = clk_prepare_enable(spi->clk);
if (ret) {
dev_err(&pdev->dev, "failed to enable clock\n");
- goto error_release_master;
+ return ret;
}

mchp_corespi_init(master, spi);
@@ -583,8 +579,6 @@ static int mchp_corespi_probe(struct platform_device *pdev)
error_release_hardware:
mchp_corespi_disable(spi);
clk_disable_unprepare(spi->clk);
-error_release_master:
- spi_master_put(master);

return ret;
}
--
2.25.1
\
 
 \ /
  Last update: 2022-07-13 04:48    [W:0.043 / U:0.460 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site