Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b094797 authored by Boris Brezillon's avatar Boris Brezillon Committed by Linus Walleij
Browse files

gpio: Rename devm_get_gpiod_from_child() 



Rename devm_get_gpiod_from_child() into
devm_fwnode_get_gpiod_from_child() to reflect the fact that this
function is operating on a fwnode object.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b2987d74

drivers/gpio/devres.c

+8 −7
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ struct gpio_desc *__must_check devm_gpiod_get_index(struct device *dev, 
EXPORT_SYMBOL(devm_gpiod_get_index);



/**

 * devm_get_gpiod_from_child - get a GPIO descriptor from a device's child node

 * devm_fwnode_get_gpiod_from_child - get a GPIO descriptor from a device's

 *				      child node

 * @dev:	GPIO consumer

 * @con_id:	function within the GPIO consumer

 * @child:	firmware node (child of @dev)
@@ -135,7 +136,7 @@ EXPORT_SYMBOL(devm_gpiod_get_index); 
 * On successfull request the GPIO pin is configured in accordance with

 * provided @flags.

 */

struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,

struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,

						   const char *con_id,

						   struct fwnode_handle *child,

						   enum gpiod_flags flags,
@@ -174,7 +175,7 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev, 


	return desc;

}

EXPORT_SYMBOL(devm_get_gpiod_from_child);

EXPORT_SYMBOL(devm_fwnode_get_gpiod_from_child);



/**

 * devm_gpiod_get_index_optional - Resource-managed gpiod_get_index_optional()

drivers/input/keyboard/gpio_keys.c

+4 −2
Original line number Diff line number Diff line
@@ -481,8 +481,10 @@ static int gpio_keys_setup_key(struct platform_device *pdev, 
	spin_lock_init(&bdata->lock);



	if (child) {

		bdata->gpiod = devm_get_gpiod_from_child(dev, NULL, child,

							 GPIOD_IN, desc);

		bdata->gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL,

								child,

								GPIOD_IN,

								desc);

		if (IS_ERR(bdata->gpiod)) {

			error = PTR_ERR(bdata->gpiod);

			if (error == -ENOENT) {

drivers/input/keyboard/gpio_keys_polled.c

+4 −4
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) 
				return -EINVAL;

			}



			bdata->gpiod = devm_get_gpiod_from_child(dev, NULL,

								 child,

			bdata->gpiod = devm_fwnode_get_gpiod_from_child(dev,

								NULL, child,

								GPIOD_IN,

								button->desc);

			if (IS_ERR(bdata->gpiod)) {

drivers/leds/leds-gpio.c

+3 −2
Original line number Diff line number Diff line
@@ -182,8 +182,9 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) 
			return ERR_PTR(-EINVAL);

		}



		led.gpiod = devm_get_gpiod_from_child(dev, NULL, child,

						      GPIOD_ASIS, led.name);

		led.gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL, child,

							     GPIOD_ASIS,

							     led.name);

		if (IS_ERR(led.gpiod)) {

			fwnode_handle_put(child);

			return ERR_CAST(led.gpiod);

drivers/video/fbdev/amba-clcd-nomadik.c

+8 −8
Original line number Diff line number Diff line
@@ -185,26 +185,26 @@ static void tpg110_init(struct device *dev, struct device_node *np, 
	dev_info(dev, "TPG110 display init\n");



	/* This asserts the GRESTB signal, putting the display into reset */

	grestb = devm_get_gpiod_from_child(dev, "grestb", &np->fwnode,

	grestb = devm_fwnode_get_gpiod_from_child(dev, "grestb", &np->fwnode,

						  GPIOD_OUT_HIGH, "grestb");

	if (IS_ERR(grestb)) {

		dev_err(dev, "no GRESTB GPIO\n");

		return;

	}

	scen = devm_get_gpiod_from_child(dev, "scen", &np->fwnode,

	scen = devm_fwnode_get_gpiod_from_child(dev, "scen", &np->fwnode,

						GPIOD_OUT_LOW, "scen");

	if (IS_ERR(scen)) {

		dev_err(dev, "no SCEN GPIO\n");

		return;

	}

	scl = devm_get_gpiod_from_child(dev, "scl", &np->fwnode, GPIOD_OUT_LOW,

					"scl");

	scl = devm_fwnode_get_gpiod_from_child(dev, "scl", &np->fwnode,

					       GPIOD_OUT_LOW, "scl");

	if (IS_ERR(scl)) {

		dev_err(dev, "no SCL GPIO\n");

		return;

	}

	sda = devm_get_gpiod_from_child(dev, "sda", &np->fwnode, GPIOD_OUT_LOW,

					"sda");

	sda = devm_fwnode_get_gpiod_from_child(dev, "sda", &np->fwnode,

					       GPIOD_OUT_LOW, "sda");

	if (IS_ERR(sda)) {

		dev_err(dev, "no SDA GPIO\n");

		return;