Commit 4a8909d0 authored Mar 10, 2019 by Andrey Smirnov Committed by Bartosz Golaszewski Mar 18, 2019

gpio: vf610: Simplify vf610_gpio_get()

Both branches of the if statement do exactly the same thing, just at
different offsets. Simplify the code a bit by moving shared action
code outside of the if statement. No functional change intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-imx@nxp.com
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

parent a262555b

drivers/gpio/gpio-vf610.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -85,17 +85,15 @@ static int vf610_gpio_get(struct gpio_chip *gc, unsigned int gpio)
		{
		struct vf610_gpio_port *port = gpiochip_get_data(gc);
		unsigned long mask = BIT(gpio);
		void __iomem *addr;
		unsigned long offset = GPIO_PDIR;

		if (port->sdata && port->sdata->have_paddr) {
		mask &= vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
		addr = mask ? port->gpio_base + GPIO_PDOR :
		port->gpio_base + GPIO_PDIR;
		return !!(vf610_gpio_readl(addr) & BIT(gpio));
		} else {
		return !!(vf610_gpio_readl(port->gpio_base + GPIO_PDIR)
		& BIT(gpio));
		if (mask)
		offset = GPIO_PDOR;
		}

		return !!(vf610_gpio_readl(port->gpio_base + offset) & BIT(gpio));
		}

		static void vf610_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)

Admin message