Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / drivers / pinctrl / pinctrl-rza1.c

diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/pinctrl-rza1.c
index 017fc6b3e27ec80e26a24ac0cebb9ab3212f844c..215db220d79536616ad733236d78f27f3f333912 100644 (file)
--- a/drivers/pinctrl/pinctrl-rza1.c
+++ b/drivers/pinctrl/pinctrl-rza1.c
@@ -617,12 +617,6 @@ static void rza1_pin_reset(struct rza1_port *port, unsigned int pin)
        spin_unlock_irqrestore(&port->lock, irqflags);
 }
 
-static inline int rza1_pin_get_direction(struct rza1_port *port,
-                                        unsigned int pin)
-{
-       return !!rza1_get_bit(port, RZA1_PM_REG, pin);
-}
-
 /**
  * rza1_pin_set_direction() - set I/O direction on a pin in port mode
  *
@@ -783,7 +777,7 @@ static int rza1_gpio_get_direction(struct gpio_chip *chip, unsigned int gpio)
 {
        struct rza1_port *port = gpiochip_get_data(chip);
 
-       return rza1_pin_get_direction(port, gpio);
+       return !!rza1_get_bit(port, RZA1_PM_REG, gpio);
 }
 
 static int rza1_gpio_direction_input(struct gpio_chip *chip,