Commit 0f21c53c authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

gpio: of: replace gpiochip_find_* with gpio_device_find_* 



We're porting all users of gpiochip_find() to using gpio_device_find().
Update the OF GPIO code.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent db546960

drivers/gpio/gpiolib-of.c

+17 −16
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ static int of_gpiochip_match_node_and_xlate(struct gpio_chip *chip, void *data) 
				chip->of_xlate(chip, gpiospec, NULL) >= 0;

}



static struct gpio_chip *of_find_gpiochip_by_xlate(

					struct of_phandle_args *gpiospec)

static struct gpio_device *

of_find_gpio_device_by_xlate(struct of_phandle_args *gpiospec)

{

	return gpiochip_find(gpiospec, of_gpiochip_match_node_and_xlate);

	return gpio_device_find(gpiospec, of_gpiochip_match_node_and_xlate);

}



static struct gpio_desc *of_xlate_and_get_gpiod_flags(struct gpio_chip *chip,
@@ -372,7 +372,6 @@ static struct gpio_desc *of_get_named_gpiod_flags(const struct device_node *np, 
		     const char *propname, int index, enum of_gpio_flags *flags)

{

	struct of_phandle_args gpiospec;

	struct gpio_chip *chip;

	struct gpio_desc *desc;

	int ret;
@@ -384,13 +383,15 @@ static struct gpio_desc *of_get_named_gpiod_flags(const struct device_node *np, 
		return ERR_PTR(ret);

	}



	chip = of_find_gpiochip_by_xlate(&gpiospec);

	if (!chip) {

	struct gpio_device *gdev __free(gpio_device_put) =

				of_find_gpio_device_by_xlate(&gpiospec);

	if (!gdev) {

		desc = ERR_PTR(-EPROBE_DEFER);

		goto out;

	}



	desc = of_xlate_and_get_gpiod_flags(chip, &gpiospec, flags);

	desc = of_xlate_and_get_gpiod_flags(gpio_device_get_chip(gdev),

					    &gpiospec, flags);

	if (IS_ERR(desc))

		goto out;
@@ -850,16 +851,16 @@ static int of_gpiochip_match_node(struct gpio_chip *chip, void *data) 
	return device_match_of_node(&chip->gpiodev->dev, data);

}



static struct gpio_chip *of_find_gpiochip_by_node(struct device_node *np)

static struct gpio_device *of_find_gpio_device_by_node(struct device_node *np)

{

	return gpiochip_find(np, of_gpiochip_match_node);

	return gpio_device_find(np, of_gpiochip_match_node);

}



static int of_gpio_notify(struct notifier_block *nb, unsigned long action,

			  void *arg)

{

	struct gpio_device *gdev __free(gpio_device_put) = NULL;

	struct of_reconfig_data *rd = arg;

	struct gpio_chip *chip;

	int ret;



	/*
@@ -876,11 +877,11 @@ static int of_gpio_notify(struct notifier_block *nb, unsigned long action, 
		if (of_node_test_and_set_flag(rd->dn, OF_POPULATED))

			return NOTIFY_DONE;



		chip = of_find_gpiochip_by_node(rd->dn->parent);

		if (chip == NULL)

		gdev = of_find_gpio_device_by_node(rd->dn->parent);

		if (!gdev)

			return NOTIFY_DONE;	/* not for us */



		ret = of_gpiochip_add_hog(chip, rd->dn);

		ret = of_gpiochip_add_hog(gpio_device_get_chip(gdev), rd->dn);

		if (ret < 0) {

			pr_err("%s: failed to add hogs for %pOF\n", __func__,

			       rd->dn);
@@ -893,11 +894,11 @@ static int of_gpio_notify(struct notifier_block *nb, unsigned long action, 
		if (!of_node_check_flag(rd->dn, OF_POPULATED))

			return NOTIFY_DONE;	/* already depopulated */



		chip = of_find_gpiochip_by_node(rd->dn->parent);

		if (chip == NULL)

		gdev = of_find_gpio_device_by_node(rd->dn->parent);

		if (!gdev)

			return NOTIFY_DONE;	/* not for us */



		of_gpiochip_remove_hog(chip, rd->dn);

		of_gpiochip_remove_hog(gpio_device_get_chip(gdev), rd->dn);

		of_node_clear_flag(rd->dn, OF_POPULATED);

		return NOTIFY_OK;

	}