staging: greybus: gpio: remove KERNEL_VERSION checks

No need to support older kernel versions in the Greybus GPIO driver, so
remove the checks as needed, we can now rely on all of the correct
GPIO core apis being present.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index 294e2f52f1d41facd9b7400c49a0c4eca65df8db..ea8234abf1856f30e08820df4a043554fdf15adc 100644 (file)
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -404,11 +404,7 @@ static int gb_gpio_request_handler(struct gb_operation *op)
        }
 
        local_irq_disable();
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
-       generic_handle_irq_desc(irq, desc);
-#else
        generic_handle_irq_desc(desc);
-#endif
        local_irq_enable();
 
        return 0;
@@ -684,11 +680,7 @@ static int gb_gpio_probe(struct gbphy_device *gbphy_dev,
        gpio = &ggc->chip;
 
        gpio->label = "greybus_gpio";
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
        gpio->parent = &gbphy_dev->dev;
-#else
-       gpio->dev = &gbphy_dev->dev;
-#endif
        gpio->owner = THIS_MODULE;
 
        gpio->request = gb_gpio_request;
@@ -750,7 +742,7 @@ static void gb_gpio_remove(struct gbphy_device *gbphy_dev)
                gbphy_runtime_get_noresume(gbphy_dev);
 
        gb_connection_disable_rx(connection);
-       gb_gpiochip_remove(&ggc->chip);
+       gpiochip_remove(&ggc->chip);
        gb_gpio_irqchip_remove(ggc);
        gb_connection_disable(connection);
        gb_connection_destroy(connection);

diff --git a/drivers/staging/greybus/kernel_ver.h b/drivers/staging/greybus/kernel_ver.h
index eda9485459171c22a768c9db0e3739257d028251..0e129ff6c6d6cd61a90b86b99d7c749ce3010d40 100644 (file)
--- a/drivers/staging/greybus/kernel_ver.h
+++ b/drivers/staging/greybus/kernel_ver.h
@@ -22,28 +22,6 @@
 #define CORE_OWNS_PSY_STRUCT
 #endif
 
-/*
- * The GPIO api sucks rocks in places, like removal, so work around their
- * explicit requirements of catching the return value for kernels older than
- * 3.17, which they explicitly changed in the 3.17 kernel.  Consistency is
- * overrated.
- */
-#include <linux/gpio.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
-static inline void gb_gpiochip_remove(struct gpio_chip *chip)
-{
-       gpiochip_remove(chip);
-}
-#else
-static inline void gb_gpiochip_remove(struct gpio_chip *chip)
-{
-       int ret;
-
-       ret = gpiochip_remove(chip);
-}
-#endif
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
 #define MMC_HS400_SUPPORTED
 #define MMC_DDR52_DEFINED