Skip to content

Commit 2d3e635

Browse files
Jinjie Ruanbroonie
authored andcommitted
spi: atmel-quadspi: 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]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent c2ea9b8 commit 2d3e635

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

drivers/spi/atmel-quadspi.c

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -602,18 +602,16 @@ static int atmel_qspi_probe(struct platform_device *pdev)
602602

603603
/* Map the registers */
604604
aq->regs = devm_platform_ioremap_resource_byname(pdev, "qspi_base");
605-
if (IS_ERR(aq->regs)) {
606-
dev_err(&pdev->dev, "missing registers\n");
607-
return PTR_ERR(aq->regs);
608-
}
605+
if (IS_ERR(aq->regs))
606+
return dev_err_probe(&pdev->dev, PTR_ERR(aq->regs),
607+
"missing registers\n");
609608

610609
/* Map the AHB memory */
611610
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mmap");
612611
aq->mem = devm_ioremap_resource(&pdev->dev, res);
613-
if (IS_ERR(aq->mem)) {
614-
dev_err(&pdev->dev, "missing AHB memory\n");
615-
return PTR_ERR(aq->mem);
616-
}
612+
if (IS_ERR(aq->mem))
613+
return dev_err_probe(&pdev->dev, PTR_ERR(aq->mem),
614+
"missing AHB memory\n");
617615

618616
aq->mmap_size = resource_size(res);
619617

@@ -622,17 +620,15 @@ static int atmel_qspi_probe(struct platform_device *pdev)
622620
if (IS_ERR(aq->pclk))
623621
aq->pclk = devm_clk_get(&pdev->dev, NULL);
624622

625-
if (IS_ERR(aq->pclk)) {
626-
dev_err(&pdev->dev, "missing peripheral clock\n");
627-
return PTR_ERR(aq->pclk);
628-
}
623+
if (IS_ERR(aq->pclk))
624+
return dev_err_probe(&pdev->dev, PTR_ERR(aq->pclk),
625+
"missing peripheral clock\n");
629626

630627
/* Enable the peripheral clock */
631628
err = clk_prepare_enable(aq->pclk);
632-
if (err) {
633-
dev_err(&pdev->dev, "failed to enable the peripheral clock\n");
634-
return err;
635-
}
629+
if (err)
630+
return dev_err_probe(&pdev->dev, err,
631+
"failed to enable the peripheral clock\n");
636632

637633
aq->caps = of_device_get_match_data(&pdev->dev);
638634
if (!aq->caps) {

0 commit comments

Comments
 (0)