[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1335959206-8138-1-git-send-email-broonie@opensource.wolfsonmicro.com>
Date: Wed, 2 May 2012 12:46:45 +0100
From: Mark Brown <broonie@...nsource.wolfsonmicro.com>
To: Grant Likely <grant.likely@...retlab.ca>,
Linus Walleij <linus.walleij@...ricsson.com>
Cc: linux-kernel@...r.kernel.org,
Mark Brown <broonie@...nsource.wolfsonmicro.com>
Subject: [PATCH 1/2] gpiolib: Add !CONFIG_GPIOLIB definitions of devm_ functions
Currently the managed gpio_request() and gpio_free() are not stubbed out
for configurations not using gpiolib - do that to aid use in drivers.
Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
---
I thought you'd applied this but it's not showing up in -next.
include/linux/gpio.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index d1890d46..8e0fe1b 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -66,6 +66,12 @@ static inline int devm_gpio_request(struct device *dev, unsigned gpio,
return -ENOSYS;
}
+static inline int devm_gpio_request(struct device *dev, unsigned gpio,
+ const char *label)
+{
+ return -ENOSYS;
+}
+
static inline int gpio_request_one(unsigned gpio,
unsigned long flags, const char *label)
{
@@ -93,6 +99,14 @@ static inline void devm_gpio_free(struct device *dev, unsigned gpio)
WARN_ON(1);
}
+static inline void devm_gpio_free(struct device *dev, unsigned gpio)
+{
+ might_sleep();
+
+ /* GPIO can never have been requested */
+ WARN_ON(1);
+}
+
static inline void gpio_free_array(const struct gpio *array, size_t num)
{
might_sleep();
--
1.7.10
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists