summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2022-07-13 10:56:57 +0800
committerMark Brown <broonie@kernel.org>2022-07-13 13:49:00 +0100
commitcdeaf3a99a02b6f8566bcaacc9c3501c6cceda74 (patch)
tree05dc1850db07d04a6b7fb9da70559ebbbebe4ba2 /drivers/spi
parent5d56d8974d1e5fa5d7d0761037377e03f6edcc66 (diff)
downloadlinux-cdeaf3a99a02b6f8566bcaacc9c3501c6cceda74.tar.bz2
spi: microchip-core: switch to use dev_err_probe()
Switch to use dev_err_probe() to simpify error path. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Link: https://lore.kernel.org/r/20220713025657.3524506-4-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-microchip-core.c42
1 files changed, 17 insertions, 25 deletions
diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c
index 1a24e47f8305..ce4385330b19 100644
--- a/drivers/spi/spi-microchip-core.c
+++ b/drivers/spi/spi-microchip-core.c
@@ -539,48 +539,40 @@ static int mchp_corespi_probe(struct platform_device *pdev)
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);
- return -ENXIO;
- }
+ if (spi->irq <= 0)
+ return dev_err_probe(&pdev->dev, -ENXIO,
+ "invalid IRQ %d for SPI controller\n",
+ spi->irq);
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);
- return ret;
- }
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret,
+ "could not request irq: %d\n", ret);
spi->clk = devm_clk_get(&pdev->dev, NULL);
- if (IS_ERR(spi->clk)) {
- dev_err(&pdev->dev, "could not get clk: %d\n", ret);
- return PTR_ERR(spi->clk);
- }
+ if (IS_ERR(spi->clk))
+ return dev_err_probe(&pdev->dev, PTR_ERR(spi->clk),
+ "could not get clk: %d\n", ret);
ret = clk_prepare_enable(spi->clk);
- if (ret) {
- dev_err(&pdev->dev, "failed to enable clock\n");
- return ret;
- }
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret,
+ "failed to enable clock\n");
mchp_corespi_init(master, spi);
ret = devm_spi_register_master(&pdev->dev, master);
if (ret) {
- dev_err(&pdev->dev,
- "unable to register master for SPI controller\n");
- goto error_release_hardware;
+ mchp_corespi_disable(spi);
+ clk_disable_unprepare(spi->clk);
+ return dev_err_probe(&pdev->dev, ret,
+ "unable to register master for SPI controller\n");
}
dev_info(&pdev->dev, "Registered SPI controller %d\n", master->bus_num);
return 0;
-
-error_release_hardware:
- mchp_corespi_disable(spi);
- clk_disable_unprepare(spi->clk);
-
- return ret;
}
static int mchp_corespi_remove(struct platform_device *pdev)