Skip to content

Commit 6afe489

Browse files
committed
pinctrl: cherryview: 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 cf6dd6c commit 6afe489

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

drivers/pinctrl/intel/pinctrl-cherryview.c

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1528,10 +1528,8 @@ static int chv_gpio_add_pin_ranges(struct gpio_chip *chip)
15281528
for (i = 0; i < community->ngpps; i++) {
15291529
gpp = &community->gpps[i];
15301530
ret = gpiochip_add_pin_range(chip, dev_name(dev), gpp->base, gpp->base, gpp->size);
1531-
if (ret) {
1532-
dev_err(dev, "failed to add GPIO pin range\n");
1533-
return ret;
1534-
}
1531+
if (ret)
1532+
return dev_err_probe(dev, ret, "failed to add GPIO pin range\n");
15351533
}
15361534

15371535
return 0;
@@ -1567,17 +1565,13 @@ static int chv_gpio_probe(struct intel_pinctrl *pctrl, int irq)
15671565
chip->irq.init_valid_mask = chv_init_irq_valid_mask;
15681566
} else {
15691567
irq_base = devm_irq_alloc_descs(dev, -1, 0, pctrl->soc->npins, NUMA_NO_NODE);
1570-
if (irq_base < 0) {
1571-
dev_err(dev, "Failed to allocate IRQ numbers\n");
1572-
return irq_base;
1573-
}
1568+
if (irq_base < 0)
1569+
return dev_err_probe(dev, irq_base, "failed to allocate IRQ numbers\n");
15741570
}
15751571

15761572
ret = devm_gpiochip_add_data(dev, chip, pctrl);
1577-
if (ret) {
1578-
dev_err(dev, "Failed to register gpiochip\n");
1579-
return ret;
1580-
}
1573+
if (ret)
1574+
return dev_err_probe(dev, ret, "failed to register gpiochip\n");
15811575

15821576
if (!need_valid_mask) {
15831577
for (i = 0; i < community->ngpps; i++) {
@@ -1673,10 +1667,8 @@ static int chv_pinctrl_probe(struct platform_device *pdev)
16731667
pctrl->pctldesc.npins = pctrl->soc->npins;
16741668

16751669
pctrl->pctldev = devm_pinctrl_register(dev, &pctrl->pctldesc, pctrl);
1676-
if (IS_ERR(pctrl->pctldev)) {
1677-
dev_err(dev, "failed to register pinctrl driver\n");
1678-
return PTR_ERR(pctrl->pctldev);
1679-
}
1670+
if (IS_ERR(pctrl->pctldev))
1671+
return dev_err_probe(dev, PTR_ERR(pctrl->pctldev), "failed to register pinctrl\n");
16801672

16811673
ret = chv_gpio_probe(pctrl, irq);
16821674
if (ret)

0 commit comments

Comments
 (0)