gpio: vf610: simplify code by dropping data check

All of_device_id entries has valid data, so code simplified
a bit by dropping the data check.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
index 8e12706c0b2201203fec21702e911552f3f53b7f..c03dfda41d4c9df06bbe1a457e08bd37ff988fc9 100644 (file)
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
@@ -100,7 +100,7 @@ static int vf610_gpio_get(struct gpio_chip *gc, unsigned int gpio)
        unsigned long mask = BIT(gpio);
        unsigned long offset = GPIO_PDIR;
 
-       if (port->sdata && port->sdata->have_paddr) {
+       if (port->sdata->have_paddr) {
                mask &= vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
                if (mask)
                        offset = GPIO_PDOR;
@@ -124,7 +124,7 @@ static int vf610_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
        unsigned long mask = BIT(gpio);
        u32 val;
 
-       if (port->sdata && port->sdata->have_paddr) {
+       if (port->sdata->have_paddr) {
                val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
                val &= ~mask;
                vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);
@@ -140,7 +140,7 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
        unsigned long mask = BIT(gpio);
        u32 val;
 
-       if (port->sdata && port->sdata->have_paddr) {
+       if (port->sdata->have_paddr) {
                val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
                val |= mask;
                vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);