Merge tag 'tty-5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-microblaze.git] / drivers / gpio / gpio-sifive.c

diff --git a/drivers/gpio/gpio-sifive.c b/drivers/gpio/gpio-sifive.c
index 147a1bd..c54dd08 100644 (file)
--- a/drivers/gpio/gpio-sifive.c
+++ b/drivers/gpio/gpio-sifive.c
@@ -35,7 +35,7 @@ struct sifive_gpio {
        void __iomem            *base;
        struct gpio_chip        gc;
        struct regmap           *regs;
-       u32                     irq_state;
+       unsigned long           irq_state;
        unsigned int            trigger[SIFIVE_GPIO_MAX];
        unsigned int            irq_parent[SIFIVE_GPIO_MAX];
 };
@@ -94,7 +94,7 @@ static void sifive_gpio_irq_enable(struct irq_data *d)
        spin_unlock_irqrestore(&gc->bgpio_lock, flags);
 
        /* Enable interrupts */
-       assign_bit(offset, (unsigned long *)&chip->irq_state, 1);
+       assign_bit(offset, &chip->irq_state, 1);
        sifive_gpio_set_ie(chip, offset);
 }
 
@@ -104,7 +104,7 @@ static void sifive_gpio_irq_disable(struct irq_data *d)
        struct sifive_gpio *chip = gpiochip_get_data(gc);
        int offset = irqd_to_hwirq(d) % SIFIVE_GPIO_MAX;
 
-       assign_bit(offset, (unsigned long *)&chip->irq_state, 0);
+       assign_bit(offset, &chip->irq_state, 0);
        sifive_gpio_set_ie(chip, offset);
        irq_chip_disable_parent(d);
 }