Unverified Commit 025bf377 authored by Waibel Georg's avatar Waibel Georg Committed by Mark Brown
Browse files

gpio: Fix return value mismatch of function gpiod_get_from_of_node() 



In case the requested gpio property is not found in the device tree, some
callers of gpiod_get_from_of_node() expect a return value of NULL, others
expect -ENOENT.
In particular devm_fwnode_get_index_gpiod_from_child() expects -ENOENT.
Currently it gets a NULL, which breaks the loop that tries all
gpio_suffixes. The result is that a gpio property is not found, even
though it is there.

This patch changes gpiod_get_from_of_node() to return -ENOENT instead
of NULL when the requested gpio property is not found in the device
tree. Additionally it modifies all calling functions to properly
evaluate the return value.

Another approach would be to leave the return value of
gpiod_get_from_of_node() as is and fix the bug in
devm_fwnode_get_index_gpiod_from_child(). Other callers would still need
to be reworked. The effort would be the same as with the chosen solution.

Signed-off-by: default avatarGeorg Waibel <georg.waibel@sensor-technik.de>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 65d80db2

drivers/gpio/gpiolib.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -4244,8 +4244,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_index); 
 *

 *

 * Returns:

 * Returns:

 * On successful request the GPIO pin is configured in accordance with

 * On successful request the GPIO pin is configured in accordance with

 * provided @dflags. If the node does not have the requested GPIO

 * provided @dflags.

 * property, NULL is returned.

 *

 *

 * In case of error an ERR_PTR() is returned.

 * In case of error an ERR_PTR() is returned.

 */

 */
@@ -4267,9 +4266,6 @@ struct gpio_desc *gpiod_get_from_of_node(struct device_node *node, 
					index, &flags);

					index, &flags);





	if (!desc || IS_ERR(desc)) {

	if (!desc || IS_ERR(desc)) {

		/* If it is not there, just return NULL */

		if (PTR_ERR(desc) == -ENOENT)

			return NULL;

		return desc;

		return desc;

	}

	}

drivers/regulator/da9211-regulator.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -289,6 +289,8 @@ static struct da9211_pdata *da9211_parse_regulators_dt( 
				  0,

				  0,

				  GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE,

				  GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE,

				  "da9211-enable");

				  "da9211-enable");

		if (IS_ERR(pdata->gpiod_ren[n]))

			pdata->gpiod_ren[n] = NULL;

		n++;

		n++;

	}

	}

drivers/regulator/s2mps11.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -843,7 +843,9 @@ static void s2mps14_pmic_dt_parse_ext_control_gpio(struct platform_device *pdev, 
				0,

				0,

				GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE,

				GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE,

				"s2mps11-regulator");

				"s2mps11-regulator");

		if (IS_ERR(gpio[reg])) {

		if (PTR_ERR(gpio[reg]) == -ENOENT)

			gpio[reg] = NULL;

		else if (IS_ERR(gpio[reg])) {

			dev_err(&pdev->dev, "Failed to get control GPIO for %d/%s\n",

			dev_err(&pdev->dev, "Failed to get control GPIO for %d/%s\n",

				reg, rdata[reg].name);

				reg, rdata[reg].name);

			continue;

			continue;

drivers/regulator/s5m8767.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -574,7 +574,9 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, 
			0,

			0,

			GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE,

			GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE,

			"s5m8767");

			"s5m8767");

		if (IS_ERR(rdata->ext_control_gpiod))

		if (PTR_ERR(rdata->ext_control_gpiod) == -ENOENT)

			rdata->ext_control_gpiod = NULL;

		else if (IS_ERR(rdata->ext_control_gpiod))

			return PTR_ERR(rdata->ext_control_gpiod);

			return PTR_ERR(rdata->ext_control_gpiod);





		rdata->id = i;

		rdata->id = i;

drivers/regulator/tps65090-regulator.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -371,11 +371,12 @@ static struct tps65090_platform_data *tps65090_parse_dt_reg_data( 
								    "dcdc-ext-control-gpios", 0,

								    "dcdc-ext-control-gpios", 0,

								    gflags,

								    gflags,

								    "tps65090");

								    "tps65090");

			if (IS_ERR(rpdata->gpiod))

			if (PTR_ERR(rpdata->gpiod) == -ENOENT) {

				return ERR_CAST(rpdata->gpiod);

			if (!rpdata->gpiod)

				dev_err(&pdev->dev,

				dev_err(&pdev->dev,

					"could not find DCDC external control GPIO\n");

					"could not find DCDC external control GPIO\n");

				rpdata->gpiod = NULL;

			} else if (IS_ERR(rpdata->gpiod))

				return ERR_CAST(rpdata->gpiod);

		}

		}





		if (of_property_read_u32(tps65090_matches[idx].of_node,

		if (of_property_read_u32(tps65090_matches[idx].of_node,

CRA Git | Maintained and supported by SUSTech CRA and CCSE