Skip to content

Commit

Permalink
arm: plat-omap: Cleanup irq_desc access
Browse files Browse the repository at this point in the history
1) Core code stores the flow type already
2) Flow type is accessible in irq_data

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Mar 29, 2011
1 parent d1118f6 commit 8c04a17
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions arch/arm/plat-omap/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -755,12 +755,6 @@ static int gpio_irq_type(struct irq_data *d, unsigned type)
bank = irq_data_get_irq_chip_data(d);
spin_lock_irqsave(&bank->lock, flags);
retval = _set_gpio_triggering(bank, get_gpio_index(gpio), type);
if (retval == 0) {
struct irq_desc *desc = irq_to_desc(d->irq);

desc->status &= ~IRQ_TYPE_SENSE_MASK;
desc->status |= type;
}
spin_unlock_irqrestore(&bank->lock, flags);

if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
Expand Down Expand Up @@ -1270,8 +1264,7 @@ static void gpio_unmask_irq(struct irq_data *d)
unsigned int gpio = d->irq - IH_GPIO_BASE;
struct gpio_bank *bank = irq_data_get_irq_chip_data(d);
unsigned int irq_mask = 1 << get_gpio_index(gpio);
struct irq_desc *desc = irq_to_desc(d->irq);
u32 trigger = desc->status & IRQ_TYPE_SENSE_MASK;
u32 trigger = irqd_get_trigger_type(d);

if (trigger)
_set_gpio_triggering(bank, get_gpio_index(gpio), trigger);
Expand Down

0 comments on commit 8c04a17

Please sign in to comment.