gpio: em: Use irq_data_get_irq_chip_data() at appropriate places

Then we can remove irq_to_priv() function.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index ae37181798b3c979d9ce423a437f7ba09511166a..6c7a91a7127aa32f840d0596fdb3dd148f2fd61b 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -85,22 +85,16 @@ static inline void em_gio_write(struct em_gio_priv *p, int offs,
                iowrite32(value, p->base1 + (offs - GIO_IDT0));
 }
 
-static inline struct em_gio_priv *irq_to_priv(struct irq_data *d)
-{
-       struct irq_chip *chip = irq_data_get_irq_chip(d);
-       return container_of(chip, struct em_gio_priv, irq_chip);
-}
-
 static void em_gio_irq_disable(struct irq_data *d)
 {
-       struct em_gio_priv *p = irq_to_priv(d);
+       struct em_gio_priv *p = irq_data_get_irq_chip_data(d);
 
        em_gio_write(p, GIO_IDS, BIT(irqd_to_hwirq(d)));
 }
 
 static void em_gio_irq_enable(struct irq_data *d)
 {
-       struct em_gio_priv *p = irq_to_priv(d);
+       struct em_gio_priv *p = irq_data_get_irq_chip_data(d);
 
        em_gio_write(p, GIO_IEN, BIT(irqd_to_hwirq(d)));
 }
@@ -118,7 +112,7 @@ static unsigned char em_gio_sense_table[IRQ_TYPE_SENSE_MASK + 1] = {
 static int em_gio_irq_set_type(struct irq_data *d, unsigned int type)
 {
        unsigned char value = em_gio_sense_table[type & IRQ_TYPE_SENSE_MASK];
-       struct em_gio_priv *p = irq_to_priv(d);
+       struct em_gio_priv *p = irq_data_get_irq_chip_data(d);
        unsigned int reg, offset, shift;
        unsigned long flags;
        unsigned long tmp;