| Message ID | 20230113171051.19309-2-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] pinctrl: bcm: bcm2835: Switch to use ->add_pin_ranges() | expand |
On Fri, Jan 13, 2023 at 6:14 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > This reverts commit 3550bba25d5587a701e6edf20e20984d2ee72c78. > > No users for this one, revert it for good. > The ->add_pin_ranges() can be used instead. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > v2: made it as a pure revert > drivers/gpio/gpiolib-of.c | 5 ----- > include/linux/gpio/driver.h | 12 ------------ > 2 files changed, 17 deletions(-) > > diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c > index 72d8a3da31e3..266352b1a966 100644 > --- a/drivers/gpio/gpiolib-of.c > +++ b/drivers/gpio/gpiolib-of.c > @@ -980,11 +980,6 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) > if (!np) > return 0; > > - if (!of_property_read_bool(np, "gpio-ranges") && > - chip->of_gpio_ranges_fallback) { > - return chip->of_gpio_ranges_fallback(chip, np); > - } > - > group_names = of_find_property(np, group_names_propname, NULL); > > for (;; index++) { > diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h > index ddc7a14a274f..5ab50ba3c309 100644 > --- a/include/linux/gpio/driver.h > +++ b/include/linux/gpio/driver.h > @@ -521,18 +521,6 @@ struct gpio_chip { > */ > int (*of_xlate)(struct gpio_chip *gc, > const struct of_phandle_args *gpiospec, u32 *flags); > - > - /** > - * @of_gpio_ranges_fallback: > - * > - * Optional hook for the case that no gpio-ranges property is defined > - * within the device tree node "np" (usually DT before introduction > - * of gpio-ranges). So this callback is helpful to provide the > - * necessary backward compatibility for the pin ranges. > - */ > - int (*of_gpio_ranges_fallback)(struct gpio_chip *gc, > - struct device_node *np); > - > #endif /* CONFIG_OF_GPIO */ > }; > > -- > 2.39.0 > Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 72d8a3da31e3..266352b1a966 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -980,11 +980,6 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) if (!np) return 0; - if (!of_property_read_bool(np, "gpio-ranges") && - chip->of_gpio_ranges_fallback) { - return chip->of_gpio_ranges_fallback(chip, np); - } - group_names = of_find_property(np, group_names_propname, NULL); for (;; index++) { diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index ddc7a14a274f..5ab50ba3c309 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -521,18 +521,6 @@ struct gpio_chip { */ int (*of_xlate)(struct gpio_chip *gc, const struct of_phandle_args *gpiospec, u32 *flags); - - /** - * @of_gpio_ranges_fallback: - * - * Optional hook for the case that no gpio-ranges property is defined - * within the device tree node "np" (usually DT before introduction - * of gpio-ranges). So this callback is helpful to provide the - * necessary backward compatibility for the pin ranges. - */ - int (*of_gpio_ranges_fallback)(struct gpio_chip *gc, - struct device_node *np); - #endif /* CONFIG_OF_GPIO */ };
This reverts commit 3550bba25d5587a701e6edf20e20984d2ee72c78. No users for this one, revert it for good. The ->add_pin_ranges() can be used instead. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: made it as a pure revert drivers/gpio/gpiolib-of.c | 5 ----- include/linux/gpio/driver.h | 12 ------------ 2 files changed, 17 deletions(-)