Merge tag 'phy-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy

[linux-block.git] / include / linux / gpio.h

diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 8528353e073b652c7585c4b6f78cda43cd303af8..7ecc25c543cef36b24425b479492dc366a7003da 100644 (file)
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -32,17 +32,6 @@ struct device;
 /* Gpio pin is active-low */
 #define GPIOF_ACTIVE_LOW        (1 << 2)
 
-/* Gpio pin is open drain */
-#define GPIOF_OPEN_DRAIN       (1 << 3)
-
-/* Gpio pin is open source */
-#define GPIOF_OPEN_SOURCE      (1 << 4)
-
-#define GPIOF_EXPORT           (1 << 5)
-#define GPIOF_EXPORT_CHANGEABLE        (1 << 6)
-#define GPIOF_EXPORT_DIR_FIXED (GPIOF_EXPORT)
-#define GPIOF_EXPORT_DIR_CHANGEABLE (GPIOF_EXPORT | GPIOF_EXPORT_CHANGEABLE)
-
 /**
  * struct gpio - a structure describing a GPIO with configuration
  * @gpio:      the GPIO number
@@ -119,11 +108,6 @@ static inline void gpio_set_value(unsigned gpio, int value)
        return gpiod_set_raw_value(gpio_to_desc(gpio), value);
 }
 
-static inline int gpio_cansleep(unsigned gpio)
-{
-       return gpiod_cansleep(gpio_to_desc(gpio));
-}
-
 static inline int gpio_to_irq(unsigned gpio)
 {
        return gpiod_to_irq(gpio_to_desc(gpio));
@@ -206,13 +190,6 @@ static inline void gpio_set_value(unsigned gpio, int value)
        WARN_ON(1);
 }
 
-static inline int gpio_cansleep(unsigned gpio)
-{
-       /* GPIO can never have been requested or set as {in,out}put */
-       WARN_ON(1);
-       return 0;
-}
-
 static inline int gpio_get_value_cansleep(unsigned gpio)
 {
        /* GPIO can never have been requested or set as {in,out}put */