summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-14 10:54:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-14 10:54:40 -0700
commitba3b7d827e96e90e3df82695c96b3f9a666c0d82 (patch)
treec491c4152ec5dcc80cf557a7562116a787024911
parent4f9a197c223cc019801be948e444d05904391109 (diff)
parentb2dfaa8d33cee9dd4ed78979f5d70063df546101 (diff)
downloadlinux-3.10-ba3b7d827e96e90e3df82695c96b3f9a666c0d82.tar.gz
linux-3.10-ba3b7d827e96e90e3df82695c96b3f9a666c0d82.tar.bz2
linux-3.10-ba3b7d827e96e90e3df82695c96b3f9a666c0d82.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fix from Greg Ungerer: "This contains only a single compilation fix for ColdFire m68k targets that use local non-GPIOLIB support." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: define a local gpio_request_one() function
-rw-r--r--arch/m68k/include/asm/gpio.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/gpio.h b/arch/m68k/include/asm/gpio.h
index 4395ffc51fd..8cc83431805 100644
--- a/arch/m68k/include/asm/gpio.h
+++ b/arch/m68k/include/asm/gpio.h
@@ -86,4 +86,24 @@ static inline int gpio_cansleep(unsigned gpio)
return gpio < MCFGPIO_PIN_MAX ? 0 : __gpio_cansleep(gpio);
}
+static inline int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
+{
+ int err;
+
+ err = gpio_request(gpio, label);
+ if (err)
+ return err;
+
+ if (flags & GPIOF_DIR_IN)
+ err = gpio_direction_input(gpio);
+ else
+ err = gpio_direction_output(gpio,
+ (flags & GPIOF_INIT_HIGH) ? 1 : 0);
+
+ if (err)
+ gpio_free(gpio);
+
+ return err;
+}
+
#endif