From 525d5eb4da40e5d64441a3db918acc989c5840e0 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Fri, 2 Mar 2012 15:56:03 -0700
Subject: [PATCH] --- yaml --- r: 296909 b: refs/heads/master c:
 6e2cf6514066cdd5a0844b34760029a5a4870318 h: refs/heads/master i:   296907:
 3c2bb4b0556c22415c567079c0db2bfa38779b27 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpio/gpiolib.c     | 5 +++--
 trunk/drivers/of/gpio.c          | 2 +-
 trunk/include/asm-generic/gpio.h | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 519279f93eef..3b3804df00c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3950d50cfc343b3e7dc5c69c96a61b182fd1e37
+refs/heads/master: 6e2cf6514066cdd5a0844b34760029a5a4870318
diff --git a/trunk/drivers/gpio/gpiolib.c b/trunk/drivers/gpio/gpiolib.c
index d77354068b90..e633a2afbe90 100644
--- a/trunk/drivers/gpio/gpiolib.c
+++ b/trunk/drivers/gpio/gpiolib.c
@@ -1152,8 +1152,9 @@ 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(void *data,
-				int (*match)(struct gpio_chip *chip, void *data))
+struct gpio_chip *gpiochip_find(const void *data,
+				int (*match)(struct gpio_chip *chip,
+					     const void *data))
 {
 	struct gpio_chip *chip = NULL;
 	unsigned long flags;
diff --git a/trunk/drivers/of/gpio.c b/trunk/drivers/of/gpio.c
index e034b38590a8..bba81216b4db 100644
--- a/trunk/drivers/of/gpio.c
+++ b/trunk/drivers/of/gpio.c
@@ -229,7 +229,7 @@ void of_gpiochip_remove(struct gpio_chip *chip)
 }
 
 /* Private function for resolving node pointer to gpio_chip */
-static int of_gpiochip_is_match(struct gpio_chip *chip, void *data)
+static int of_gpiochip_is_match(struct gpio_chip *chip, const void *data)
 {
 	return chip->of_node == data;
 }
diff --git a/trunk/include/asm-generic/gpio.h b/trunk/include/asm-generic/gpio.h
index 1ff4e221cb4d..5f52690c3c8f 100644
--- a/trunk/include/asm-generic/gpio.h
+++ b/trunk/include/asm-generic/gpio.h
@@ -142,9 +142,9 @@ 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(void *data,
+extern struct gpio_chip *gpiochip_find(const void *data,
 					int (*match)(struct gpio_chip *chip,
-						     void *data));
+						     const void *data));
 
 
 /* Always use the library code for GPIO management calls,