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

Commit 192c369c authored by Linus Walleij's avatar Linus Walleij
Browse files

gpiolib: rename find_pinctrl_* 



Rename the function find_pinctrl_and_add_gpio_range()
to pinctrl_find_and_add_gpio_range() so as to be consistent
with the rest of the functions.

Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3f0f8670

drivers/gpio/gpiolib.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1216,7 +1216,7 @@ int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name, 
	pin_range->range.base = chip->base + offset;

	pin_range->range.base = chip->base + offset;

	pin_range->range.pin_base = pin_base;

	pin_range->range.pin_base = pin_base;

	pin_range->range.npins = npins;

	pin_range->range.npins = npins;

	pin_range->pctldev = find_pinctrl_and_add_gpio_range(pinctl_name,

	pin_range->pctldev = pinctrl_find_and_add_gpio_range(pinctl_name,

			&pin_range->range);

			&pin_range->range);

	if (!pin_range->pctldev) {

	if (!pin_range->pctldev) {

		pr_err("%s: GPIO chip: could not create pin range\n",

		pr_err("%s: GPIO chip: could not create pin range\n",

drivers/pinctrl/core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -345,7 +345,7 @@ void pinctrl_add_gpio_ranges(struct pinctrl_dev *pctldev, 
}

}

EXPORT_SYMBOL_GPL(pinctrl_add_gpio_ranges);

EXPORT_SYMBOL_GPL(pinctrl_add_gpio_ranges);





struct pinctrl_dev *find_pinctrl_and_add_gpio_range(const char *devname,

struct pinctrl_dev *pinctrl_find_and_add_gpio_range(const char *devname,

		struct pinctrl_gpio_range *range)

		struct pinctrl_gpio_range *range)

{

{

	struct pinctrl_dev *pctldev = get_pinctrl_dev_from_devname(devname);

	struct pinctrl_dev *pctldev = get_pinctrl_dev_from_devname(devname);
@@ -356,7 +356,7 @@ struct pinctrl_dev *find_pinctrl_and_add_gpio_range(const char *devname, 
	pinctrl_add_gpio_range(pctldev, range);

	pinctrl_add_gpio_range(pctldev, range);

	return pctldev;

	return pctldev;

}

}

EXPORT_SYMBOL_GPL(find_pinctrl_and_add_gpio_range);

EXPORT_SYMBOL_GPL(pinctrl_find_and_add_gpio_range);





/**

/**

 * pinctrl_remove_gpio_range() - remove a range of GPIOs fro a pin controller

 * pinctrl_remove_gpio_range() - remove a range of GPIOs fro a pin controller

include/linux/pinctrl/pinctrl.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -137,7 +137,7 @@ extern void pinctrl_add_gpio_ranges(struct pinctrl_dev *pctldev, 
extern void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev,

extern void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev,

				struct pinctrl_gpio_range *range);

				struct pinctrl_gpio_range *range);





extern struct pinctrl_dev *find_pinctrl_and_add_gpio_range(const char *devname,

extern struct pinctrl_dev *pinctrl_find_and_add_gpio_range(const char *devname,

		struct pinctrl_gpio_range *range);

		struct pinctrl_gpio_range *range);





#ifdef CONFIG_OF

#ifdef CONFIG_OF