diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2016-09-08 15:52:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-09-19 16:41:45 +0200 |
| commit | b14bb976260077415047737a0032f89275622c96 (patch) | |
| tree | ed05e479657e509e83b0052544ceaded209aaad4 /drivers/staging/greybus/gpio.c | |
| parent | 06000c03174988b4e8167d03ad0a36c6792686cb (diff) | |
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>
Diffstat (limited to 'drivers/staging/greybus/gpio.c')
| -rw-r--r-- | drivers/staging/greybus/gpio.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c index 294e2f52f1d4..ea8234abf185 100644 --- 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); |