Skip to content

Commit cf6dd6c

Browse files
committed
pinctrl: baytrail: 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 3a86608 commit cf6dd6c

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

drivers/pinctrl/intel/pinctrl-baytrail.c

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,9 +1498,9 @@ static int byt_gpio_add_pin_ranges(struct gpio_chip *chip)
14981498

14991499
ret = gpiochip_add_pin_range(chip, dev_name(dev), 0, 0, vg->soc->npins);
15001500
if (ret)
1501-
dev_err(dev, "failed to add GPIO pin range\n");
1501+
return dev_err_probe(dev, ret, "failed to add GPIO pin range\n");
15021502

1503-
return ret;
1503+
return 0;
15041504
}
15051505

15061506
static int byt_gpio_probe(struct intel_pinctrl *vg)
@@ -1548,9 +1548,9 @@ static int byt_gpio_probe(struct intel_pinctrl *vg)
15481548

15491549
ret = devm_gpiochip_add_data(vg->dev, gc, vg);
15501550
if (ret)
1551-
dev_err(vg->dev, "failed adding byt-gpio chip\n");
1551+
return dev_err_probe(vg->dev, ret, "failed to register gpiochip\n");
15521552

1553-
return ret;
1553+
return 0;
15541554
}
15551555

15561556
static int byt_set_soc_data(struct intel_pinctrl *vg,
@@ -1601,21 +1601,17 @@ static int byt_pinctrl_probe(struct platform_device *pdev)
16011601

16021602
vg->dev = dev;
16031603
ret = byt_set_soc_data(vg, soc_data);
1604-
if (ret) {
1605-
dev_err(dev, "failed to set soc data\n");
1606-
return ret;
1607-
}
1604+
if (ret)
1605+
return dev_err_probe(dev, ret, "failed to set soc data\n");
16081606

16091607
vg->pctldesc = byt_pinctrl_desc;
16101608
vg->pctldesc.name = dev_name(dev);
16111609
vg->pctldesc.pins = vg->soc->pins;
16121610
vg->pctldesc.npins = vg->soc->npins;
16131611

16141612
vg->pctldev = devm_pinctrl_register(dev, &vg->pctldesc, vg);
1615-
if (IS_ERR(vg->pctldev)) {
1616-
dev_err(dev, "failed to register pinctrl driver\n");
1617-
return PTR_ERR(vg->pctldev);
1618-
}
1613+
if (IS_ERR(vg->pctldev))
1614+
return dev_err_probe(dev, PTR_ERR(vg->pctldev), "failed to register pinctrl\n");
16191615

16201616
ret = byt_gpio_probe(vg);
16211617
if (ret)

0 commit comments

Comments
 (0)