Merge tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemo...

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

diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
index 39dca14..19ce667 100644 (file)
--- a/drivers/gpio/gpio-uniphier.c
+++ b/drivers/gpio/gpio-uniphier.c
@@ -179,8 +179,8 @@ static int uniphier_gpio_to_irq(struct gpio_chip *chip, unsigned int offset)
 
 static void uniphier_gpio_irq_mask(struct irq_data *data)
 {
-       struct uniphier_gpio_priv *priv = data->chip_data;
-       u32 mask = BIT(data->hwirq);
+       struct uniphier_gpio_priv *priv = irq_data_get_irq_chip_data(data);
+       u32 mask = BIT(irqd_to_hwirq(data));
 
        uniphier_gpio_reg_update(priv, UNIPHIER_GPIO_IRQ_EN, mask, 0);
 
@@ -189,8 +189,8 @@ static void uniphier_gpio_irq_mask(struct irq_data *data)
 
 static void uniphier_gpio_irq_unmask(struct irq_data *data)
 {
-       struct uniphier_gpio_priv *priv = data->chip_data;
-       u32 mask = BIT(data->hwirq);
+       struct uniphier_gpio_priv *priv = irq_data_get_irq_chip_data(data);
+       u32 mask = BIT(irqd_to_hwirq(data));
 
        uniphier_gpio_reg_update(priv, UNIPHIER_GPIO_IRQ_EN, mask, mask);
 
@@ -199,8 +199,8 @@ static void uniphier_gpio_irq_unmask(struct irq_data *data)
 
 static int uniphier_gpio_irq_set_type(struct irq_data *data, unsigned int type)
 {
-       struct uniphier_gpio_priv *priv = data->chip_data;
-       u32 mask = BIT(data->hwirq);
+       struct uniphier_gpio_priv *priv = irq_data_get_irq_chip_data(data);
+       u32 mask = BIT(irqd_to_hwirq(data));
        u32 val = 0;
 
        if (type == IRQ_TYPE_EDGE_BOTH) {
@@ -297,7 +297,8 @@ static int uniphier_gpio_irq_domain_activate(struct irq_domain *domain,
        struct uniphier_gpio_priv *priv = domain->host_data;
        struct gpio_chip *chip = &priv->chip;
 
-       return gpiochip_lock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET);
+       return gpiochip_lock_as_irq(chip,
+                       irqd_to_hwirq(data) + UNIPHIER_GPIO_IRQ_OFFSET);
 }
 
 static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain,
@@ -306,7 +307,8 @@ static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain,
        struct uniphier_gpio_priv *priv = domain->host_data;
        struct gpio_chip *chip = &priv->chip;
 
-       gpiochip_unlock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET);
+       gpiochip_unlock_as_irq(chip,
+                       irqd_to_hwirq(data) + UNIPHIER_GPIO_IRQ_OFFSET);
 }
 
 static const struct irq_domain_ops uniphier_gpio_irq_domain_ops = {