From 2489fa75bfd3bd196b862b497c41744aca34f851 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 3 Aug 2012 10:29:10 +0200 Subject: [PATCH 23/25] owrt gpio export --- drivers/gpio/gpiolib.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 17fdf4b..7b8d336 100644 --- 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,6 @@ int gpio_export(unsigned gpio, bool direction_may_change) if (desc->chip->names && desc->chip->names[gpio - desc->chip->base]) ioname = desc->chip->names[gpio - desc->chip->base]; - if (status == 0) { struct device *dev; @@ -1351,11 +1350,11 @@ const char *gpiochip_is_requested(struct gpio_chip *chip, unsigned offset) 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); -- 1.7.9.1