Skip to content

Commit e2620a2

Browse files
committed
pinctrl: intel: Unify messages with help of dev_err_probe()
Unify error messages that might appear during probe phase by switching to use dev_err_probe(). Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent 6afe489 commit e2620a2

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

drivers/pinctrl/intel/pinctrl-intel.c

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,10 +1356,8 @@ static int intel_gpio_add_pin_ranges(struct gpio_chip *gc)
13561356
ret = gpiochip_add_pin_range(&pctrl->chip, dev_name(pctrl->dev),
13571357
grp->gpio_base, grp->base,
13581358
grp->size);
1359-
if (ret) {
1360-
dev_err(pctrl->dev, "failed to add GPIO pin range\n");
1361-
return ret;
1362-
}
1359+
if (ret)
1360+
return dev_err_probe(pctrl->dev, ret, "failed to add GPIO pin range\n");
13631361
}
13641362

13651363
return 0;
@@ -1401,10 +1399,8 @@ static int intel_gpio_probe(struct intel_pinctrl *pctrl, int irq)
14011399
ret = devm_request_irq(pctrl->dev, irq, intel_gpio_irq,
14021400
IRQF_SHARED | IRQF_NO_THREAD,
14031401
dev_name(pctrl->dev), pctrl);
1404-
if (ret) {
1405-
dev_err(pctrl->dev, "failed to request interrupt\n");
1406-
return ret;
1407-
}
1402+
if (ret)
1403+
return dev_err_probe(pctrl->dev, ret, "failed to request interrupt\n");
14081404

14091405
/* Setup IRQ chip */
14101406
girq = &pctrl->chip.irq;
@@ -1417,10 +1413,8 @@ static int intel_gpio_probe(struct intel_pinctrl *pctrl, int irq)
14171413
girq->init_hw = intel_gpio_irq_init_hw;
14181414

14191415
ret = devm_gpiochip_add_data(pctrl->dev, &pctrl->chip, pctrl);
1420-
if (ret) {
1421-
dev_err(pctrl->dev, "failed to register gpiochip\n");
1422-
return ret;
1423-
}
1416+
if (ret)
1417+
return dev_err_probe(pctrl->dev, ret, "failed to register gpiochip\n");
14241418

14251419
return 0;
14261420
}
@@ -1668,10 +1662,8 @@ int intel_pinctrl_probe(struct platform_device *pdev,
16681662
pctrl->pctldesc.npins = pctrl->soc->npins;
16691663

16701664
pctrl->pctldev = devm_pinctrl_register(dev, &pctrl->pctldesc, pctrl);
1671-
if (IS_ERR(pctrl->pctldev)) {
1672-
dev_err(dev, "failed to register pinctrl driver\n");
1673-
return PTR_ERR(pctrl->pctldev);
1674-
}
1665+
if (IS_ERR(pctrl->pctldev))
1666+
return dev_err_probe(dev, PTR_ERR(pctrl->pctldev), "failed to register pinctrl\n");
16751667

16761668
ret = intel_gpio_probe(pctrl, irq);
16771669
if (ret)

0 commit comments

Comments
 (0)