Signed-off-by: Abanoub Sameh <abanoubsameh@xxxxxxxxxxxxxx> --- drivers/gpio/gpio-ml-ioh.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c index 92b6e958cfed..7007621a5b55 100644 --- a/drivers/gpio/gpio-ml-ioh.c +++ b/drivers/gpio/gpio-ml-ioh.c @@ -89,7 +89,7 @@ struct ioh_gpio { static const int num_ports[] = {6, 12, 16, 16, 15, 16, 16, 12}; -static void ioh_gpio_set(struct gpio_chip *gpio, unsigned nr, int val) +static void ioh_gpio_set(struct gpio_chip *gpio, unsigned int nr, int val) { u32 reg_val; struct ioh_gpio *chip = gpiochip_get_data(gpio); @@ -106,14 +106,14 @@ static void ioh_gpio_set(struct gpio_chip *gpio, unsigned nr, int val) spin_unlock_irqrestore(&chip->spinlock, flags); } -static int ioh_gpio_get(struct gpio_chip *gpio, unsigned nr) +static int ioh_gpio_get(struct gpio_chip *gpio, unsigned int nr) { struct ioh_gpio *chip = gpiochip_get_data(gpio); return !!(ioread32(&chip->reg->regs[chip->ch].pi) & (1 << nr)); } -static int ioh_gpio_direction_output(struct gpio_chip *gpio, unsigned nr, +static int ioh_gpio_direction_output(struct gpio_chip *gpio, unsigned int nr, int val) { struct ioh_gpio *chip = gpiochip_get_data(gpio); @@ -139,7 +139,7 @@ static int ioh_gpio_direction_output(struct gpio_chip *gpio, unsigned nr, return 0; } -static int ioh_gpio_direction_input(struct gpio_chip *gpio, unsigned nr) +static int ioh_gpio_direction_input(struct gpio_chip *gpio, unsigned int nr) { struct ioh_gpio *chip = gpiochip_get_data(gpio); u32 pm; @@ -209,9 +209,10 @@ static void ioh_gpio_restore_reg_conf(struct ioh_gpio *chip) } #endif -static int ioh_gpio_to_irq(struct gpio_chip *gpio, unsigned offset) +static int ioh_gpio_to_irq(struct gpio_chip *gpio, unsigned int offset) { struct ioh_gpio *chip = gpiochip_get_data(gpio); + return chip->irq_base + offset; } -- 2.28.0.rc0