summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-03-08 07:41:41 (GMT)
committerLinus Walleij <linus.walleij@linaro.org>2016-03-08 07:41:41 (GMT)
commit016bf20829fa00f5e64805f77b7677365151f4af (patch)
tree5ef012a06aaa59e7ee5bbed984322f0a97c37309 /include
parenta961f9b472de93e770d53b7340a58dbff64b4075 (diff)
parent725e3b7d40dffa10dbe0a24ba70676a3127f79fc (diff)
downloadlinux-016bf20829fa00f5e64805f77b7677365151f4af.tar.xz
Merge branch 'devm-gpiochip-add-data' into devel
Diffstat (limited to 'include')
-rw-r--r--include/linux/gpio/driver.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 6396076..bee976f 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -192,6 +192,10 @@ static inline int gpiochip_add(struct gpio_chip *chip)
return gpiochip_add_data(chip, NULL);
}
extern void gpiochip_remove(struct gpio_chip *chip);
+extern int devm_gpiochip_add_data(struct device *dev, struct gpio_chip *chip,
+ void *data);
+extern void devm_gpiochip_remove(struct device *dev, struct gpio_chip *chip);
+
extern struct gpio_chip *gpiochip_find(void *data,
int (*match)(struct gpio_chip *chip, void *data));