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

Merge patch series "pinctrl: intel: Unify error messages" 

Andy Shevchenko <andriy.shevchenko@linux.intel.com> says:

Unify error messages with help of dev_err_probe(). This brings
a common pattern with error code printed as well. While at it,
make the text message the same for the same reasons across
the Intel pin control drivers.

Link: https://patch.msgid.link/20251103200235.712436-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parents 3a866087 534ea60b

drivers/pinctrl/intel/pinctrl-baytrail.c

+8 −12
Original line number Diff line number Diff line
@@ -1498,9 +1498,9 @@ static int byt_gpio_add_pin_ranges(struct gpio_chip *chip) 


	ret = gpiochip_add_pin_range(chip, dev_name(dev), 0, 0, vg->soc->npins);

	if (ret)

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

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



	return ret;

	return 0;

}



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


	ret = devm_gpiochip_add_data(vg->dev, gc, vg);

	if (ret)

		dev_err(vg->dev, "failed adding byt-gpio chip\n");

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



	return ret;

	return 0;

}



static int byt_set_soc_data(struct intel_pinctrl *vg,
@@ -1601,10 +1601,8 @@ static int byt_pinctrl_probe(struct platform_device *pdev) 


	vg->dev = dev;

	ret = byt_set_soc_data(vg, soc_data);

	if (ret) {

		dev_err(dev, "failed to set soc data\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "failed to set soc data\n");



	vg->pctldesc		= byt_pinctrl_desc;

	vg->pctldesc.name	= dev_name(dev);
@@ -1612,10 +1610,8 @@ static int byt_pinctrl_probe(struct platform_device *pdev) 
	vg->pctldesc.npins	= vg->soc->npins;



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

	if (IS_ERR(vg->pctldev)) {

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

		return PTR_ERR(vg->pctldev);

	}

	if (IS_ERR(vg->pctldev))

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



	ret = byt_gpio_probe(vg);

	if (ret)

drivers/pinctrl/intel/pinctrl-cherryview.c

+8 −16
Original line number Diff line number Diff line
@@ -1528,10 +1528,8 @@ static int chv_gpio_add_pin_ranges(struct gpio_chip *chip) 
	for (i = 0; i < community->ngpps; i++) {

		gpp = &community->gpps[i];

		ret = gpiochip_add_pin_range(chip, dev_name(dev), gpp->base, gpp->base, gpp->size);

		if (ret) {

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

			return ret;

		}

		if (ret)

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

	}



	return 0;
@@ -1567,17 +1565,13 @@ static int chv_gpio_probe(struct intel_pinctrl *pctrl, int irq) 
		chip->irq.init_valid_mask = chv_init_irq_valid_mask;

	} else {

		irq_base = devm_irq_alloc_descs(dev, -1, 0, pctrl->soc->npins, NUMA_NO_NODE);

		if (irq_base < 0) {

			dev_err(dev, "Failed to allocate IRQ numbers\n");

			return irq_base;

		}

		if (irq_base < 0)

			return dev_err_probe(dev, irq_base, "failed to allocate IRQ numbers\n");

	}



	ret = devm_gpiochip_add_data(dev, chip, pctrl);

	if (ret) {

		dev_err(dev, "Failed to register gpiochip\n");

		return ret;

	}

	if (ret)

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



	if (!need_valid_mask) {

		for (i = 0; i < community->ngpps; i++) {
@@ -1673,10 +1667,8 @@ static int chv_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 = chv_gpio_probe(pctrl, irq);

	if (ret)

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)

drivers/pinctrl/intel/pinctrl-lynxpoint.c

+10 −18
Original line number Diff line number Diff line
@@ -700,9 +700,9 @@ static int lp_gpio_add_pin_ranges(struct gpio_chip *chip) 


	ret = gpiochip_add_pin_range(chip, dev_name(dev), 0, 0, lg->soc->npins);

	if (ret)

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

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



	return ret;

	return 0;

}



static int lp_gpio_probe(struct platform_device *pdev)
@@ -739,24 +739,18 @@ static int lp_gpio_probe(struct platform_device *pdev) 
	lg->pctldesc.npins     = lg->soc->npins;



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

	if (IS_ERR(lg->pctldev)) {

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

		return PTR_ERR(lg->pctldev);

	}

	if (IS_ERR(lg->pctldev))

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



	platform_set_drvdata(pdev, lg);



	io_rc = platform_get_resource(pdev, IORESOURCE_IO, 0);

	if (!io_rc) {

		dev_err(dev, "missing IO resources\n");

		return -EINVAL;

	}

	if (!io_rc)

		return dev_err_probe(dev, -EINVAL, "missing IO resources\n");



	regs = devm_ioport_map(dev, io_rc->start, resource_size(io_rc));

	if (!regs) {

		dev_err(dev, "failed mapping IO region %pR\n", &io_rc);

		return -EBUSY;

	}

	if (!regs)

		return dev_err_probe(dev, -EBUSY, "failed mapping IO region %pR\n", &io_rc);



	for (i = 0; i < lg->soc->ncommunities; i++) {

		struct intel_community *comm = &lg->communities[i];
@@ -807,10 +801,8 @@ static int lp_gpio_probe(struct platform_device *pdev) 
	}



	ret = devm_gpiochip_add_data(dev, gc, lg);

	if (ret) {

		dev_err(dev, "failed adding lp-gpio chip\n");

		return ret;

	}

	if (ret)

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



	return 0;

}

drivers/pinctrl/intel/pinctrl-tangier.c

+1 −2
Original line number Diff line number Diff line
@@ -562,8 +562,7 @@ static int tng_pinctrl_probe(struct platform_device *pdev, 


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

	if (IS_ERR(tp->pctldev))

		return dev_err_probe(dev, PTR_ERR(tp->pctldev),

				     "failed to register pinctrl driver\n");

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



	return 0;

}