Commit b57587f1 authored by Peng Fan's avatar Peng Fan Committed by Bartosz Golaszewski
Browse files

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: default avatarPeng Fan <peng.fan@nxp.com>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 76bc907b

drivers/gpio/gpio-vf610.c

+3 −3
Original line number Diff line number Diff line
@@ -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);