Skip to content

Commit d814fd0

Browse files
Jinjie Ruanbroonie
authored andcommitted
spi: zynqmp-gqspi: Simplify with dev_err_probe()
Use the dev_err_probe() helper to simplify error handling during probe. This also handle scenario, when EDEFER is returned and useless error is printed. Signed-off-by: Jinjie Ruan <[email protected]> Acked-by: Michal Simek <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 64640f6 commit d814fd0

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

drivers/spi/spi-zynqmp-gqspi.c

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,22 +1242,18 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)
12421242
return PTR_ERR(xqspi->regs);
12431243

12441244
xqspi->pclk = devm_clk_get(&pdev->dev, "pclk");
1245-
if (IS_ERR(xqspi->pclk)) {
1246-
dev_err(dev, "pclk clock not found.\n");
1247-
return PTR_ERR(xqspi->pclk);
1248-
}
1245+
if (IS_ERR(xqspi->pclk))
1246+
return dev_err_probe(dev, PTR_ERR(xqspi->pclk),
1247+
"pclk clock not found.\n");
12491248

12501249
xqspi->refclk = devm_clk_get(&pdev->dev, "ref_clk");
1251-
if (IS_ERR(xqspi->refclk)) {
1252-
dev_err(dev, "ref_clk clock not found.\n");
1253-
return PTR_ERR(xqspi->refclk);
1254-
}
1250+
if (IS_ERR(xqspi->refclk))
1251+
return dev_err_probe(dev, PTR_ERR(xqspi->refclk),
1252+
"ref_clk clock not found.\n");
12551253

12561254
ret = clk_prepare_enable(xqspi->pclk);
1257-
if (ret) {
1258-
dev_err(dev, "Unable to enable APB clock.\n");
1259-
return ret;
1260-
}
1255+
if (ret)
1256+
return dev_err_probe(dev, ret, "Unable to enable APB clock.\n");
12611257

12621258
ret = clk_prepare_enable(xqspi->refclk);
12631259
if (ret) {

0 commit comments

Comments
 (0)