tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

gpio: bcm-kona: Include proper header

This driver has no business including <linux/gpio.h>, it is a
driver so include <linux/gpio/driver.h>.

GPIOF_DIR_IN/GPIOF_DIR_OUT are for consumers and should not be
used in drivers to use just 1/0 instead.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Linus Walleij 14ec018e 2e21ec4c

+4 -4
+4 -4
drivers/gpio/gpio-bcm-kona.c
··· 17 17 #include <linux/bitops.h> 18 18 #include <linux/err.h> 19 19 #include <linux/io.h> 20 - #include <linux/gpio.h> 20 + #include <linux/gpio/driver.h> 21 21 #include <linux/of_device.h> 22 22 #include <linux/of_irq.h> 23 23 #include <linux/init.h> ··· 127 127 u32 val; 128 128 129 129 val = readl(reg_base + GPIO_CONTROL(gpio)) & GPIO_GPCTR0_IOTR_MASK; 130 - return val ? GPIOF_DIR_IN : GPIOF_DIR_OUT; 130 + return !!val; 131 131 } 132 132 133 133 static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value) ··· 144 144 raw_spin_lock_irqsave(&kona_gpio->lock, flags); 145 145 146 146 /* this function only applies to output pin */ 147 - if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN) 147 + if (bcm_kona_gpio_get_dir(chip, gpio) == 1) 148 148 goto out; 149 149 150 150 reg_offset = value ? GPIO_OUT_SET(bank_id) : GPIO_OUT_CLEAR(bank_id); ··· 170 170 reg_base = kona_gpio->reg_base; 171 171 raw_spin_lock_irqsave(&kona_gpio->lock, flags); 172 172 173 - if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN) 173 + if (bcm_kona_gpio_get_dir(chip, gpio) == 1) 174 174 reg_offset = GPIO_IN_STATUS(bank_id); 175 175 else 176 176 reg_offset = GPIO_OUT_STATUS(bank_id);