lkml.org 
[lkml]   [2023]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 07/18] gpiolib: remove asm-generic/gpio.h
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    The asm-generic/gpio.h file is now always included when
    using gpiolib, so just move its contents into linux/gpio.h
    with a few minor simplifications.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    MAINTAINERS | 1 -
    arch/m68k/include/asm/mcfgpio.h | 2 +-
    drivers/gpio/gpio-davinci.c | 2 -
    drivers/pinctrl/core.c | 1 -
    include/asm-generic/gpio.h | 146 --------------------------------
    include/linux/gpio.h | 94 +++++++++++++++++---
    6 files changed, 85 insertions(+), 161 deletions(-)
    delete mode 100644 include/asm-generic/gpio.h

    diff --git a/MAINTAINERS b/MAINTAINERS
    index 94971603568b..955a513ac504 100644
    --- a/MAINTAINERS
    +++ b/MAINTAINERS
    @@ -8730,7 +8730,6 @@ F: Documentation/admin-guide/gpio/
    F: Documentation/devicetree/bindings/gpio/
    F: Documentation/driver-api/gpio/
    F: drivers/gpio/
    -F: include/asm-generic/gpio.h
    F: include/dt-bindings/gpio/
    F: include/linux/gpio.h
    F: include/linux/gpio/
    diff --git a/arch/m68k/include/asm/mcfgpio.h b/arch/m68k/include/asm/mcfgpio.h
    index 27f32cc81da6..2cefe8445980 100644
    --- a/arch/m68k/include/asm/mcfgpio.h
    +++ b/arch/m68k/include/asm/mcfgpio.h
    @@ -9,7 +9,7 @@
    #define mcfgpio_h

    #ifdef CONFIG_GPIOLIB
    -#include <asm-generic/gpio.h>
    +#include <linux/gpio.h>
    #else

    int __mcfgpio_get_value(unsigned gpio);
    diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
    index 26b1f7465e09..7fc83057990a 100644
    --- a/drivers/gpio/gpio-davinci.c
    +++ b/drivers/gpio/gpio-davinci.c
    @@ -24,8 +24,6 @@
    #include <linux/spinlock.h>
    #include <linux/pm_runtime.h>

    -#include <asm-generic/gpio.h>
    -
    #define MAX_REGS_BANKS 5
    #define MAX_INT_PER_BANK 32

    diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
    index d6e6c751255f..401886c81344 100644
    --- a/drivers/pinctrl/core.c
    +++ b/drivers/pinctrl/core.c
    @@ -30,7 +30,6 @@

    #ifdef CONFIG_GPIOLIB
    #include "../gpio/gpiolib.h"
    -#include <asm-generic/gpio.h>
    #endif

    #include "core.h"
    diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
    deleted file mode 100644
    index 1c910d124423..000000000000
    --- a/include/asm-generic/gpio.h
    +++ /dev/null
    @@ -1,146 +0,0 @@
    -/* SPDX-License-Identifier: GPL-2.0 */
    -#ifndef _ASM_GENERIC_GPIO_H
    -#define _ASM_GENERIC_GPIO_H
    -
    -#include <linux/types.h>
    -#include <linux/errno.h>
    -
    -#ifdef CONFIG_GPIOLIB
    -
    -#include <linux/compiler.h>
    -#include <linux/gpio/consumer.h>
    -
    -/*
    - * Platforms may implement their GPIO interface with library code,
    - * at a small performance cost for non-inlined operations and some
    - * extra memory (for code and for per-GPIO table entries).
    - */
    -
    -/*
    - * At the end we want all GPIOs to be dynamically allocated from 0.
    - * However, some legacy drivers still perform fixed allocation.
    - * Until they are all fixed, leave 0-512 space for them.
    - */
    -#define GPIO_DYNAMIC_BASE 512
    -
    -struct device;
    -struct gpio;
    -struct seq_file;
    -struct module;
    -struct device_node;
    -struct gpio_desc;
    -
    -/* Always use the library code for GPIO management calls,
    - * or when sleeping may be involved.
    - */
    -extern int gpio_request(unsigned gpio, const char *label);
    -extern void gpio_free(unsigned gpio);
    -
    -static inline int gpio_direction_input(unsigned gpio)
    -{
    - return gpiod_direction_input(gpio_to_desc(gpio));
    -}
    -static inline int gpio_direction_output(unsigned gpio, int value)
    -{
    - return gpiod_direction_output_raw(gpio_to_desc(gpio), value);
    -}
    -
    -static inline int gpio_set_debounce(unsigned gpio, unsigned debounce)
    -{
    - return gpiod_set_debounce(gpio_to_desc(gpio), debounce);
    -}
    -
    -static inline int gpio_get_value_cansleep(unsigned gpio)
    -{
    - return gpiod_get_raw_value_cansleep(gpio_to_desc(gpio));
    -}
    -static inline void gpio_set_value_cansleep(unsigned gpio, int value)
    -{
    - return gpiod_set_raw_value_cansleep(gpio_to_desc(gpio), value);
    -}
    -
    -
    -/* A platform's <asm/gpio.h> code may want to inline the I/O calls when
    - * the GPIO is constant and refers to some always-present controller,
    - * giving direct access to chip registers and tight bitbanging loops.
    - */
    -static inline int __gpio_get_value(unsigned gpio)
    -{
    - return gpiod_get_raw_value(gpio_to_desc(gpio));
    -}
    -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));
    -}
    -
    -extern int gpio_request_one(unsigned gpio, unsigned long flags, const char *label);
    -extern int gpio_request_array(const struct gpio *array, size_t num);
    -extern void gpio_free_array(const struct gpio *array, size_t num);
    -
    -/*
    - * A sysfs interface can be exported by individual drivers if they want,
    - * but more typically is configured entirely from userspace.
    - */
    -static inline int gpio_export(unsigned gpio, bool direction_may_change)
    -{
    - return gpiod_export(gpio_to_desc(gpio), direction_may_change);
    -}
    -
    -static inline void gpio_unexport(unsigned gpio)
    -{
    - gpiod_unexport(gpio_to_desc(gpio));
    -}
    -
    -#else /* !CONFIG_GPIOLIB */
    -
    -#include <linux/kernel.h>
    -
    -/* platforms that don't directly support access to GPIOs through I2C, SPI,
    - * or other blocking infrastructure can use these wrappers.
    - */
    -
    -static inline int gpio_cansleep(unsigned gpio)
    -{
    - return 0;
    -}
    -
    -static inline int gpio_get_value_cansleep(unsigned gpio)
    -{
    - might_sleep();
    - return __gpio_get_value(gpio);
    -}
    -
    -static inline void gpio_set_value_cansleep(unsigned gpio, int value)
    -{
    - might_sleep();
    - __gpio_set_value(gpio, value);
    -}
    -
    -#endif /* !CONFIG_GPIOLIB */
    -
    -/*
    - * "valid" GPIO numbers are nonnegative and may be passed to
    - * setup routines like gpio_request(). only some valid numbers
    - * can successfully be requested and used.
    - *
    - * Invalid GPIO numbers are useful for indicating no-such-GPIO in
    - * platform data and other tables.
    - */
    -
    -static inline bool gpio_is_valid(int number)
    -{
    - /* only non-negative numbers are valid */
    - return number >= 0;
    -}
    -
    -#endif /* _ASM_GENERIC_GPIO_H */
    diff --git a/include/linux/gpio.h b/include/linux/gpio.h
    index 2b75017b3aad..d5ce78e2bdd9 100644
    --- a/include/linux/gpio.h
    +++ b/include/linux/gpio.h
    @@ -13,6 +13,7 @@
    #define __LINUX_GPIO_H

    #include <linux/errno.h>
    +#include <linux/types.h>

    /* see Documentation/driver-api/gpio/legacy.rst */

    @@ -54,26 +55,100 @@ struct gpio {
    };

    #ifdef CONFIG_GPIOLIB
    -#include <asm-generic/gpio.h>

    -static inline int gpio_get_value(unsigned int gpio)
    +#include <linux/gpio/consumer.h>
    +
    +/*
    + * "valid" GPIO numbers are nonnegative and may be passed to
    + * setup routines like gpio_request(). Only some valid numbers
    + * can successfully be requested and used.
    + *
    + * Invalid GPIO numbers are useful for indicating no-such-GPIO in
    + * platform data and other tables.
    + */
    +static inline bool gpio_is_valid(int number)
    +{
    + /* only non-negative numbers are valid */
    + return number >= 0;
    +}
    +
    +/*
    + * Platforms may implement their GPIO interface with library code,
    + * at a small performance cost for non-inlined operations and some
    + * extra memory (for code and for per-GPIO table entries).
    + */
    +
    +/*
    + * At the end we want all GPIOs to be dynamically allocated from 0.
    + * However, some legacy drivers still perform fixed allocation.
    + * Until they are all fixed, leave 0-512 space for them.
    + */
    +#define GPIO_DYNAMIC_BASE 512
    +
    +/* Always use the library code for GPIO management calls,
    + * or when sleeping may be involved.
    + */
    +int gpio_request(unsigned gpio, const char *label);
    +void gpio_free(unsigned gpio);
    +
    +static inline int gpio_direction_input(unsigned gpio)
    +{
    + return gpiod_direction_input(gpio_to_desc(gpio));
    +}
    +static inline int gpio_direction_output(unsigned gpio, int value)
    +{
    + return gpiod_direction_output_raw(gpio_to_desc(gpio), value);
    +}
    +
    +static inline int gpio_set_debounce(unsigned gpio, unsigned debounce)
    +{
    + return gpiod_set_debounce(gpio_to_desc(gpio), debounce);
    +}
    +
    +static inline int gpio_get_value_cansleep(unsigned gpio)
    +{
    + return gpiod_get_raw_value_cansleep(gpio_to_desc(gpio));
    +}
    +static inline void gpio_set_value_cansleep(unsigned gpio, int value)
    {
    - return __gpio_get_value(gpio);
    + return gpiod_set_raw_value_cansleep(gpio_to_desc(gpio), value);
    }

    -static inline void gpio_set_value(unsigned int gpio, int value)
    +static inline int gpio_get_value(unsigned gpio)
    +{
    + return gpiod_get_raw_value(gpio_to_desc(gpio));
    +}
    +static inline void gpio_set_value(unsigned gpio, int value)
    {
    - __gpio_set_value(gpio, value);
    + return gpiod_set_raw_value(gpio_to_desc(gpio), value);
    }

    -static inline int gpio_cansleep(unsigned int gpio)
    +static inline int gpio_cansleep(unsigned gpio)
    {
    - return __gpio_cansleep(gpio);
    + return gpiod_cansleep(gpio_to_desc(gpio));
    }

    -static inline int gpio_to_irq(unsigned int gpio)
    +static inline int gpio_to_irq(unsigned gpio)
    {
    - return __gpio_to_irq(gpio);
    + return gpiod_to_irq(gpio_to_desc(gpio));
    +}
    +
    +int gpio_request_one(unsigned gpio, unsigned long flags, const char *label);
    +int gpio_request_array(const struct gpio *array, size_t num);
    +void gpio_free_array(const struct gpio *array, size_t num);
    +
    +/*
    + * A sysfs interface can be exported by individual drivers if they want,
    + * but more typically is configured entirely from userspace.
    + */
    +static inline int gpio_export(unsigned gpio, bool direction_may_change)
    +{
    + return gpiod_export(gpio_to_desc(gpio), direction_may_change);
    +}
    +
    +static inline void gpio_unexport(unsigned gpio)
    +{
    + gpiod_unexport(gpio_to_desc(gpio));
    }

    /* CONFIG_GPIOLIB: bindings for managed devices that want to request gpios */
    @@ -88,7 +163,6 @@ int devm_gpio_request_one(struct device *dev, unsigned gpio,

    #include <linux/bug.h>
    #include <linux/kernel.h>
    -#include <linux/types.h>

    struct device;
    struct gpio_chip;
    --
    2.39.1
    \
     
     \ /
      Last update: 2023-03-27 00:15    [W:2.372 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site