0a866293bd
* add basic vr9 support * backport 3.1 fixes * backport 3.2 queue (falcon) SVN-Revision: 28405
54 lines
1.3 KiB
Diff
54 lines
1.3 KiB
Diff
Index: linux-3.0.3/drivers/gpio/gpiolib.c
|
|
===================================================================
|
|
--- linux-3.0.3.orig/drivers/gpio/gpiolib.c 2011-10-03 00:13:35.359561120 +0200
|
|
+++ linux-3.0.3/drivers/gpio/gpiolib.c 2011-10-03 09:52:55.785047081 +0200
|
|
@@ -64,9 +64,9 @@
|
|
#define GPIO_FLAGS_MASK ((1 << ID_SHIFT) - 1)
|
|
#define GPIO_TRIGGER_MASK (BIT(FLAG_TRIG_FALL) | BIT(FLAG_TRIG_RISE))
|
|
|
|
-#ifdef CONFIG_DEBUG_FS
|
|
+//#ifdef CONFIG_DEBUG_FS
|
|
const char *label;
|
|
-#endif
|
|
+//#endif
|
|
};
|
|
static struct gpio_desc gpio_desc[ARCH_NR_GPIOS];
|
|
|
|
@@ -76,9 +76,9 @@
|
|
|
|
static inline void desc_set_label(struct gpio_desc *d, const char *label)
|
|
{
|
|
-#ifdef CONFIG_DEBUG_FS
|
|
+//#ifdef CONFIG_DEBUG_FS
|
|
d->label = label;
|
|
-#endif
|
|
+//#endif
|
|
}
|
|
|
|
/* Warn when drivers omit gpio_request() calls -- legal but ill-advised
|
|
@@ -727,7 +727,8 @@
|
|
|
|
if (desc->chip->names && desc->chip->names[gpio - desc->chip->base])
|
|
ioname = desc->chip->names[gpio - desc->chip->base];
|
|
-
|
|
+ else
|
|
+ ioname = gpio_desc[gpio].label;
|
|
if (status == 0) {
|
|
struct device *dev;
|
|
|
|
@@ -1347,11 +1348,11 @@
|
|
return NULL;
|
|
if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0)
|
|
return NULL;
|
|
-#ifdef CONFIG_DEBUG_FS
|
|
+//#ifdef CONFIG_DEBUG_FS
|
|
return gpio_desc[gpio].label;
|
|
-#else
|
|
- return "?";
|
|
-#endif
|
|
+//#else
|
|
+// return "?";
|
|
+//#endif
|
|
}
|
|
EXPORT_SYMBOL_GPL(gpiochip_is_requested);
|
|
|