|
@@ -42,6 +42,11 @@ struct altera_gpio_chip {
|
|
|
int mapped_irq;
|
|
|
};
|
|
|
|
|
|
+static struct altera_gpio_chip *to_altera(struct gpio_chip *gc)
|
|
|
+{
|
|
|
+ return container_of(gc, struct altera_gpio_chip, mmchip.gc);
|
|
|
+}
|
|
|
+
|
|
|
static void altera_gpio_irq_unmask(struct irq_data *d)
|
|
|
{
|
|
|
struct altera_gpio_chip *altera_gc;
|
|
@@ -49,7 +54,7 @@ static void altera_gpio_irq_unmask(struct irq_data *d)
|
|
|
unsigned long flags;
|
|
|
u32 intmask;
|
|
|
|
|
|
- altera_gc = irq_data_get_irq_chip_data(d);
|
|
|
+ altera_gc = to_altera(irq_data_get_irq_chip_data(d));
|
|
|
mm_gc = &altera_gc->mmchip;
|
|
|
|
|
|
spin_lock_irqsave(&altera_gc->gpio_lock, flags);
|
|
@@ -67,7 +72,7 @@ static void altera_gpio_irq_mask(struct irq_data *d)
|
|
|
unsigned long flags;
|
|
|
u32 intmask;
|
|
|
|
|
|
- altera_gc = irq_data_get_irq_chip_data(d);
|
|
|
+ altera_gc = to_altera(irq_data_get_irq_chip_data(d));
|
|
|
mm_gc = &altera_gc->mmchip;
|
|
|
|
|
|
spin_lock_irqsave(&altera_gc->gpio_lock, flags);
|
|
@@ -87,7 +92,7 @@ static int altera_gpio_irq_set_type(struct irq_data *d,
|
|
|
{
|
|
|
struct altera_gpio_chip *altera_gc;
|
|
|
|
|
|
- altera_gc = irq_data_get_irq_chip_data(d);
|
|
|
+ altera_gc = to_altera(irq_data_get_irq_chip_data(d));
|
|
|
|
|
|
if (type == IRQ_TYPE_NONE)
|
|
|
return 0;
|
|
@@ -210,7 +215,7 @@ static void altera_gpio_irq_edge_handler(struct irq_desc *desc)
|
|
|
unsigned long status;
|
|
|
int i;
|
|
|
|
|
|
- altera_gc = irq_desc_get_handler_data(desc);
|
|
|
+ altera_gc = to_altera(irq_desc_get_handler_data(desc));
|
|
|
chip = irq_desc_get_chip(desc);
|
|
|
mm_gc = &altera_gc->mmchip;
|
|
|
irqdomain = altera_gc->mmchip.gc.irqdomain;
|
|
@@ -239,7 +244,7 @@ static void altera_gpio_irq_leveL_high_handler(struct irq_desc *desc)
|
|
|
unsigned long status;
|
|
|
int i;
|
|
|
|
|
|
- altera_gc = irq_desc_get_handler_data(desc);
|
|
|
+ altera_gc = to_altera(irq_desc_get_handler_data(desc));
|
|
|
chip = irq_desc_get_chip(desc);
|
|
|
mm_gc = &altera_gc->mmchip;
|
|
|
irqdomain = altera_gc->mmchip.gc.irqdomain;
|