1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-11 22:05:20 +02:00
openwrt-xburst/target/linux/lantiq/patches/205-owrt-gpio-export.patch

53 lines
1.3 KiB
Diff
Raw Normal View History

--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -64,9 +64,9 @@ struct gpio_desc {
#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 DEFINE_IDR(dirent_idr);
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 @@ int gpio_export(unsigned gpio, bool dire
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 @@ const char *gpiochip_is_requested(struct
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);