summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-02-25 16:22:10 +0300
committerLinus Walleij <linus.walleij@linaro.org>2016-02-25 16:22:10 +0300
commit725e3b7d40dffa10dbe0a24ba70676a3127f79fc (patch)
tree3b4cfc0973de0f6459a5a340c997a78ae1dfcdb1 /include/linux
parentea1361fd5f26f1dbb369f85b3ad42a84c133e7e1 (diff)
parent9d113c696f4081bf95dd7553d6369998a666b0fa (diff)
downloadlinux-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.tar.xz
Merge branch 'devm_gpiochip' of https://github.com/ldewangan/linux-upstream into devm-gpiochip-add-data
Diffstat (limited to 'include/linux')
-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 639607658ed8..bee976f82788 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));