diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-04-12 16:40:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-04-13 13:13:45 +0200 |
| commit | 205556af93b9c08da876c4ef79bd9e3a116c49c7 (patch) | |
| tree | 40ac9fd5d300ad77a716b98c2b1e8181a0acf0b6 /arch/arm/mach-imx | |
| parent | f448803fe0ddb975e82e01dbccf3b38e73914496 (diff) | |
| download | barebox-205556af93b9c08da876c4ef79bd9e3a116c49c7.tar.gz barebox-205556af93b9c08da876c4ef79bd9e3a116c49c7.tar.xz | |
ARM: i.MX: convert early gpio value accessors to static inline functions
imx1_gpio_val() and imx31_gpio_val() lack various braces. Instead of
adding all these convert them to static inline functions.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx-gpio.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/include/mach/imx-gpio.h b/arch/arm/mach-imx/include/mach/imx-gpio.h index 0cfd16f4fa..a67a979904 100644 --- a/arch/arm/mach-imx/include/mach/imx-gpio.h +++ b/arch/arm/mach-imx/include/mach/imx-gpio.h @@ -72,11 +72,18 @@ static inline void imx31_gpio_direction_input(void *base, int gpio) #define imx6_gpio_direction_input(base, gpio) imx31_gpio_direction_input(base, gpio) #define imx8m_gpio_direction_input(base, gpio) imx31_gpio_direction_input(base, gpio) -#define imx1_gpio_val(base, gpio) readl(base + 0x1c) & (1 << gpio) ? 1 : 0 +static inline int imx1_gpio_val(void __iomem *base, int gpio) +{ + return readl(base + 0x1c) & (1 << gpio) ? 1 : 0; +} + +static inline int imx31_gpio_val(void __iomem *base, int gpio) +{ + return readl(base) & (1 << gpio) ? 1 : 0; +} + #define imx21_gpio_val(base, gpio) imx1_gpio_val(base, gpio) #define imx27_gpio_val(base, gpio) imx1_gpio_val(base, gpio) - -#define imx31_gpio_val(base, gpio) readl(base) & (1 << gpio) ? 1 : 0 #define imx25_gpio_val(base, gpio) imx31_gpio_val(base, gpio) #define imx35_gpio_val(base, gpio) imx31_gpio_val(base, gpio) #define imx51_gpio_val(base, gpio) imx31_gpio_val(base, gpio) |