Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b66b2a0a authored by Ben Dooks's avatar Ben Dooks Committed by Linus Walleij
Browse files

gpio: bcm-kona: fix bcm_kona_gpio_reset() warnings 



The bcm_kona_gpio_reset() calls bcm_kona_gpio_write_lock_regs()
with what looks like the wrong parameter. The write_lock_regs
function takes a pointer to the registers, not the bcm_kona_gpio
structure.

Fix the warning, and probably bug by changing the function to
pass reg_base instead of kona_gpio, fixing the following warning:

drivers/gpio/gpio-bcm-kona.c:550:47: warning: incorrect type in argument 1
  (different address spaces)
  expected void [noderef] <asn:2>*reg_base
  got struct bcm_kona_gpio *kona_gpio
  warning: incorrect type in argument 1 (different address spaces)
  expected void [noderef] <asn:2>*reg_base
  got struct bcm_kona_gpio *kona_gpio

Cc: stable@vger.kernel.org
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Acked-by: default avatarRay Jui <ray.jui@broadcom.com>
Reviewed-by: default avatarMarkus Mayer <mmayer@broadcom.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 60a5eaba

drivers/gpio/gpio-bcm-kona.c

+2 −2
Original line number Diff line number Diff line
@@ -547,11 +547,11 @@ static void bcm_kona_gpio_reset(struct bcm_kona_gpio *kona_gpio) 
	/* disable interrupts and clear status */

	for (i = 0; i < kona_gpio->num_bank; i++) {

		/* Unlock the entire bank first */

		bcm_kona_gpio_write_lock_regs(kona_gpio, i, UNLOCK_CODE);

		bcm_kona_gpio_write_lock_regs(reg_base, i, UNLOCK_CODE);

		writel(0xffffffff, reg_base + GPIO_INT_MASK(i));

		writel(0xffffffff, reg_base + GPIO_INT_STATUS(i));

		/* Now re-lock the bank */

		bcm_kona_gpio_write_lock_regs(kona_gpio, i, LOCK_CODE);

		bcm_kona_gpio_write_lock_regs(reg_base, i, LOCK_CODE);

	}

}