Commit e2620a2c authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

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: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 6afe489d

drivers/pinctrl/intel/pinctrl-intel.c

+8 −16
Original line number Diff line number Diff line
@@ -1356,10 +1356,8 @@ static int intel_gpio_add_pin_ranges(struct gpio_chip *gc) 
		ret = gpiochip_add_pin_range(&pctrl->chip, dev_name(pctrl->dev),

					     grp->gpio_base, grp->base,

					     grp->size);

		if (ret) {

			dev_err(pctrl->dev, "failed to add GPIO pin range\n");

			return ret;

		}

		if (ret)

			return dev_err_probe(pctrl->dev, ret, "failed to add GPIO pin range\n");

	}



	return 0;
@@ -1401,10 +1399,8 @@ static int intel_gpio_probe(struct intel_pinctrl *pctrl, int irq) 
	ret = devm_request_irq(pctrl->dev, irq, intel_gpio_irq,

			       IRQF_SHARED | IRQF_NO_THREAD,

			       dev_name(pctrl->dev), pctrl);

	if (ret) {

		dev_err(pctrl->dev, "failed to request interrupt\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(pctrl->dev, ret, "failed to request interrupt\n");



	/* Setup IRQ chip */

	girq = &pctrl->chip.irq;
@@ -1417,10 +1413,8 @@ static int intel_gpio_probe(struct intel_pinctrl *pctrl, int irq) 
	girq->init_hw = intel_gpio_irq_init_hw;



	ret = devm_gpiochip_add_data(pctrl->dev, &pctrl->chip, pctrl);

	if (ret) {

		dev_err(pctrl->dev, "failed to register gpiochip\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(pctrl->dev, ret, "failed to register gpiochip\n");



	return 0;

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



	pctrl->pctldev = devm_pinctrl_register(dev, &pctrl->pctldesc, pctrl);

	if (IS_ERR(pctrl->pctldev)) {

		dev_err(dev, "failed to register pinctrl driver\n");

		return PTR_ERR(pctrl->pctldev);

	}

	if (IS_ERR(pctrl->pctldev))

		return dev_err_probe(dev, PTR_ERR(pctrl->pctldev), "failed to register pinctrl\n");



	ret = intel_gpio_probe(pctrl, irq);

	if (ret)