Commit cdeaf3a9 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown

spi: microchip-core: switch to use dev_err_probe()

Switch to use dev_err_probe() to simpify error path.
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20220713025657.3524506-4-yangyingliang@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5d56d897
...@@ -539,48 +539,40 @@ static int mchp_corespi_probe(struct platform_device *pdev) ...@@ -539,48 +539,40 @@ static int mchp_corespi_probe(struct platform_device *pdev)
return PTR_ERR(spi->regs); return PTR_ERR(spi->regs);
spi->irq = platform_get_irq(pdev, 0); spi->irq = platform_get_irq(pdev, 0);
if (spi->irq <= 0) { if (spi->irq <= 0)
dev_err(&pdev->dev, "invalid IRQ %d for SPI controller\n", spi->irq); return dev_err_probe(&pdev->dev, -ENXIO,
return -ENXIO; "invalid IRQ %d for SPI controller\n",
} spi->irq);
ret = devm_request_irq(&pdev->dev, spi->irq, mchp_corespi_interrupt, ret = devm_request_irq(&pdev->dev, spi->irq, mchp_corespi_interrupt,
IRQF_SHARED, dev_name(&pdev->dev), master); IRQF_SHARED, dev_name(&pdev->dev), master);
if (ret) { if (ret)
dev_err(&pdev->dev, "could not request irq: %d\n", ret); return dev_err_probe(&pdev->dev, ret,
return ret; "could not request irq: %d\n", ret);
}
spi->clk = devm_clk_get(&pdev->dev, NULL); spi->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(spi->clk)) { if (IS_ERR(spi->clk))
dev_err(&pdev->dev, "could not get clk: %d\n", ret); return dev_err_probe(&pdev->dev, PTR_ERR(spi->clk),
return PTR_ERR(spi->clk); "could not get clk: %d\n", ret);
}
ret = clk_prepare_enable(spi->clk); ret = clk_prepare_enable(spi->clk);
if (ret) { if (ret)
dev_err(&pdev->dev, "failed to enable clock\n"); return dev_err_probe(&pdev->dev, ret,
return ret; "failed to enable clock\n");
}
mchp_corespi_init(master, spi); mchp_corespi_init(master, spi);
ret = devm_spi_register_master(&pdev->dev, master); ret = devm_spi_register_master(&pdev->dev, master);
if (ret) { if (ret) {
dev_err(&pdev->dev, mchp_corespi_disable(spi);
"unable to register master for SPI controller\n"); clk_disable_unprepare(spi->clk);
goto error_release_hardware; 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); dev_info(&pdev->dev, "Registered SPI controller %d\n", master->bus_num);
return 0; 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) static int mchp_corespi_remove(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment