korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 06:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

spi: atmel-quadspi: Simplify with dev_err_probe()

Browse Source 
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 <ruanjinjie@huawei.com>
Link: https://patch.msgid.link/20240826125913.3434305-3-ruanjinjie@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jinjie Ruan 2024-08-26 20:59:13 +08:00 committed by Mark Brown
parent c2ea9b8a53
commit 2d3e6351a2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/spi/atmel-quadspi.c
View File

@ -602,18 +602,16 @@ static int atmel_qspi_probe(struct platform_device *pdev)
/* Map the registers */ /* Map the registers */
aq->regs = devm_platform_ioremap_resource_byname(pdev, "qspi_base"); aq->regs = devm_platform_ioremap_resource_byname(pdev, "qspi_base");
if (IS_ERR(aq->regs)) { if (IS_ERR(aq->regs))
dev_err(&pdev->dev, "missing registers\n"); return dev_err_probe(&pdev->dev, PTR_ERR(aq->regs),
return PTR_ERR(aq->regs); "missing registers\n");
}
/* Map the AHB memory */ /* Map the AHB memory */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mmap"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mmap");
aq->mem = devm_ioremap_resource(&pdev->dev, res); aq->mem = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(aq->mem)) { if (IS_ERR(aq->mem))
dev_err(&pdev->dev, "missing AHB memory\n"); return dev_err_probe(&pdev->dev, PTR_ERR(aq->mem),
return PTR_ERR(aq->mem); "missing AHB memory\n");
}
aq->mmap_size = resource_size(res); aq->mmap_size = resource_size(res);
@ -622,17 +620,15 @@ static int atmel_qspi_probe(struct platform_device *pdev)
if (IS_ERR(aq->pclk)) if (IS_ERR(aq->pclk))
aq->pclk = devm_clk_get(&pdev->dev, NULL); aq->pclk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(aq->pclk)) { if (IS_ERR(aq->pclk))
dev_err(&pdev->dev, "missing peripheral clock\n"); return dev_err_probe(&pdev->dev, PTR_ERR(aq->pclk),
return PTR_ERR(aq->pclk); "missing peripheral clock\n");
}
/* Enable the peripheral clock */ /* Enable the peripheral clock */
err = clk_prepare_enable(aq->pclk); err = clk_prepare_enable(aq->pclk);
if (err) { if (err)
dev_err(&pdev->dev, "failed to enable the peripheral clock\n"); return dev_err_probe(&pdev->dev, err,
return err; "failed to enable the peripheral clock\n");
}
aq->caps = of_device_get_match_data(&pdev->dev); aq->caps = of_device_get_match_data(&pdev->dev);
if (!aq->caps) { if (!aq->caps) {