diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-19 01:01:05 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-19 01:01:05 -0400 |
commit | 07ce8ec7308ab3fa55fe2861671b157f857fff58 (patch) | |
tree | 4e0b2fa2f61bbae54ecfc5be7d88e4501ca497ec | |
parent | e9fe32bcadb8a7a40411d77f168abd45941b049b (diff) |
gpiolib: Remove 'const' from data argument of gpiochip_find()
Commit 3d0f7cf0 "gpio: Adjust of_xlate API to support multiple GPIO
chips" changed the api of gpiochip_find to drop const from the data
parameter of the match hook, but didn't also drop const from data
causing a build warning.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r-- | drivers/gpio/gpiolib.c | 2 | ||||
-rw-r--r-- | include/asm-generic/gpio.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index e48b70c6ddf1..120b2a0e3167 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c | |||
@@ -1154,7 +1154,7 @@ EXPORT_SYMBOL_GPL(gpiochip_remove); | |||
1154 | * non-zero, this function will return to the caller and not iterate over any | 1154 | * non-zero, this function will return to the caller and not iterate over any |
1155 | * more gpio_chips. | 1155 | * more gpio_chips. |
1156 | */ | 1156 | */ |
1157 | struct gpio_chip *gpiochip_find(const void *data, | 1157 | struct gpio_chip *gpiochip_find(void *data, |
1158 | int (*match)(struct gpio_chip *chip, | 1158 | int (*match)(struct gpio_chip *chip, |
1159 | void *data)) | 1159 | void *data)) |
1160 | { | 1160 | { |
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 1ba08f0e49a3..365ea09ed3b0 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h | |||
@@ -142,7 +142,7 @@ extern int __must_check gpiochip_reserve(int start, int ngpio); | |||
142 | /* add/remove chips */ | 142 | /* add/remove chips */ |
143 | extern int gpiochip_add(struct gpio_chip *chip); | 143 | extern int gpiochip_add(struct gpio_chip *chip); |
144 | extern int __must_check gpiochip_remove(struct gpio_chip *chip); | 144 | extern int __must_check gpiochip_remove(struct gpio_chip *chip); |
145 | extern struct gpio_chip *gpiochip_find(const void *data, | 145 | extern struct gpio_chip *gpiochip_find(void *data, |
146 | int (*match)(struct gpio_chip *chip, | 146 | int (*match)(struct gpio_chip *chip, |
147 | void *data)); | 147 | void *data)); |
148 | 148 | ||