From 7737e40af22aeb68c729bc576794c6aaaee9b863 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Fri, 18 May 2012 23:01:05 -0600 Subject: [PATCH] --- yaml --- r: 307694 b: refs/heads/master c: 07ce8ec7308ab3fa55fe2861671b157f857fff58 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpiolib.c | 2 +- trunk/include/asm-generic/gpio.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 292c17e11710..c23d6423b022 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9fe32bcadb8a7a40411d77f168abd45941b049b +refs/heads/master: 07ce8ec7308ab3fa55fe2861671b157f857fff58 diff --git a/trunk/drivers/gpio/gpiolib.c b/trunk/drivers/gpio/gpiolib.c index e48b70c6ddf1..120b2a0e3167 100644 --- a/trunk/drivers/gpio/gpiolib.c +++ b/trunk/drivers/gpio/gpiolib.c @@ -1154,7 +1154,7 @@ EXPORT_SYMBOL_GPL(gpiochip_remove); * non-zero, this function will return to the caller and not iterate over any * more gpio_chips. */ -struct gpio_chip *gpiochip_find(const void *data, +struct gpio_chip *gpiochip_find(void *data, int (*match)(struct gpio_chip *chip, void *data)) { diff --git a/trunk/include/asm-generic/gpio.h b/trunk/include/asm-generic/gpio.h index 1ba08f0e49a3..365ea09ed3b0 100644 --- a/trunk/include/asm-generic/gpio.h +++ b/trunk/include/asm-generic/gpio.h @@ -142,7 +142,7 @@ extern int __must_check gpiochip_reserve(int start, int ngpio); /* add/remove chips */ extern int gpiochip_add(struct gpio_chip *chip); extern int __must_check gpiochip_remove(struct gpio_chip *chip); -extern struct gpio_chip *gpiochip_find(const void *data, +extern struct gpio_chip *gpiochip_find(void *data, int (*match)(struct gpio_chip *chip, void *data));