This removes gpiochip_add() and of_mm_gpiochip_add() in favor of the *_data() functions that also take a pointer to driver state data. This way all new drivers will use the parametrized interface. Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx> --- include/linux/gpio/driver.h | 4 ---- include/linux/of_gpio.h | 5 ----- 2 files changed, 9 deletions(-) diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 3334ba66f6a8..0c40dc6c6b21 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -201,10 +201,6 @@ extern const char *gpiochip_is_requested(struct gpio_chip *chip, /* add/remove chips */ extern int gpiochip_add_data(struct gpio_chip *chip, void *data); -static inline int gpiochip_add(struct gpio_chip *chip) -{ - return gpiochip_add_data(chip, NULL); -} extern void gpiochip_remove(struct gpio_chip *chip); extern struct gpio_chip *gpiochip_find(void *data, int (*match)(struct gpio_chip *chip, void *data)); diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h index 54a23d6e4892..2204dc0e4493 100644 --- a/include/linux/of_gpio.h +++ b/include/linux/of_gpio.h @@ -54,11 +54,6 @@ extern int of_get_named_gpio_flags(struct device_node *np, extern int of_mm_gpiochip_add_data(struct device_node *np, struct of_mm_gpio_chip *mm_gc, void *data); -static inline int of_mm_gpiochip_add(struct device_node *np, - struct of_mm_gpio_chip *mm_gc) -{ - return of_mm_gpiochip_add_data(np, mm_gc, NULL); -} extern void of_mm_gpiochip_remove(struct of_mm_gpio_chip *mm_gc); extern int of_gpiochip_add(struct gpio_chip *gc); -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html