Skip to content

Commit 217f036

Browse files
andy-shevchanwoochoi
authored andcommitted
extcon: intel-mrfld: Switch to use dev_err_probe()
Switch to use dev_err_probe() to simplify the error path and unify a message template. Link: https://lore.kernel.org/lkml/[email protected]/ Signed-off-by: Andy Shevchenko <[email protected]> Acked-by: MyungJoo Ham <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]>
1 parent ed30a4a commit 217f036

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

drivers/extcon/extcon-intel-mrfld.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -217,24 +217,18 @@ static int mrfld_extcon_probe(struct platform_device *pdev)
217217
return -ENOMEM;
218218

219219
ret = devm_extcon_dev_register(dev, data->edev);
220-
if (ret < 0) {
221-
dev_err(dev, "can't register extcon device: %d\n", ret);
222-
return ret;
223-
}
220+
if (ret < 0)
221+
return dev_err_probe(dev, ret, "can't register extcon device\n");
224222

225223
ret = devm_request_threaded_irq(dev, irq, NULL, mrfld_extcon_interrupt,
226224
IRQF_ONESHOT | IRQF_SHARED, pdev->name,
227225
data);
228-
if (ret) {
229-
dev_err(dev, "can't register IRQ handler: %d\n", ret);
230-
return ret;
231-
}
226+
if (ret)
227+
return dev_err_probe(dev, ret, "can't register IRQ handler\n");
232228

233229
ret = regmap_read(regmap, BCOVE_ID, &id);
234-
if (ret) {
235-
dev_err(dev, "can't read PMIC ID: %d\n", ret);
236-
return ret;
237-
}
230+
if (ret)
231+
return dev_err_probe(dev, ret, "can't read PMIC ID\n");
238232

239233
data->id = id;
240234

0 commit comments

Comments
 (0)