mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 17:13:52 +02:00
mmc: atmel-mci: Switch to use dev_err_probe()
Switch to use dev_err_probe() to simplify the error path and unify a message template. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20240425170900.3767990-3-andriy.shevchenko@linux.intel.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
0a454e9523
commit
e38063b943
|
|
@ -632,10 +632,8 @@ static int atmci_of_init(struct atmel_mci *host)
|
|||
u32 slot_id;
|
||||
int err;
|
||||
|
||||
if (!np) {
|
||||
dev_err(dev, "device node not found\n");
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
if (!np)
|
||||
return dev_err_probe(dev, -EINVAL, "device node not found\n");
|
||||
|
||||
for_each_child_of_node(np, cnp) {
|
||||
if (of_property_read_u32(cnp, "reg", &slot_id)) {
|
||||
|
|
@ -2551,7 +2549,7 @@ static int atmci_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
if (!nr_slots) {
|
||||
dev_err(dev, "init failed: no slot defined\n");
|
||||
dev_err_probe(dev, ret, "init failed: no slot defined\n");
|
||||
goto err_init_slot;
|
||||
}
|
||||
|
||||
|
|
@ -2560,8 +2558,7 @@ static int atmci_probe(struct platform_device *pdev)
|
|||
&host->buf_phys_addr,
|
||||
GFP_KERNEL);
|
||||
if (!host->buffer) {
|
||||
ret = -ENOMEM;
|
||||
dev_err(dev, "buffer allocation failed\n");
|
||||
ret = dev_err_probe(dev, -ENOMEM, "buffer allocation failed\n");
|
||||
goto err_dma_alloc;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user