luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: asic3: Cleanup irq handling

Browse Source 
Remove the open coded access to irq_desc and use the proper wrappers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Thomas Gleixner 2011-03-25 11:12:26 +00:00 committed by Samuel Ortiz
parent fc498fa29c
commit 52a7d60775
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/mfd/asic3.c
View File

@ -139,13 +139,12 @@ static void asic3_irq_flip_edge(struct asic3 *asic,
static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc) static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
{ {
struct asic3 *asic = irq_desc_get_handler_data(desc);
struct irq_data *data = irq_desc_get_irq_data(desc);
int iter, i; int iter, i;
unsigned long flags; unsigned long flags;
struct asic3 *asic;
desc->irq_data.chip->irq_ack(&desc->irq_data); data->chip->irq_ack(irq_data);
asic = get_irq_data(irq);
for (iter = 0 ; iter < MAX_ASIC_ISR_LOOPS; iter++) { for (iter = 0 ; iter < MAX_ASIC_ISR_LOOPS; iter++) {
u32 status; u32 status;
@ -188,8 +187,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
irqnr = asic->irq_base + irqnr = asic->irq_base +
(ASIC3_GPIOS_PER_BANK * bank) (ASIC3_GPIOS_PER_BANK * bank)
+ i; + i;
desc = irq_to_desc(irqnr); generic_handle_irq(irqnr);
desc->handle_irq(irqnr, desc);
if (asic->irq_bothedge[bank] & bit) if (asic->irq_bothedge[bank] & bit)
asic3_irq_flip_edge(asic, base, asic3_irq_flip_edge(asic, base,
bit); bit);
@ -200,11 +198,8 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
/* Handle remaining IRQs in the status register */ /* Handle remaining IRQs in the status register */
for (i = ASIC3_NUM_GPIOS; i < ASIC3_NR_IRQS; i++) { for (i = ASIC3_NUM_GPIOS; i < ASIC3_NR_IRQS; i++) {
/* They start at bit 4 and go up */ /* They start at bit 4 and go up */
if (status & (1 << (i - ASIC3_NUM_GPIOS + 4))) { if (status & (1 << (i - ASIC3_NUM_GPIOS + 4)))
desc = irq_to_desc(asic->irq_base + i); generic_handle_irq(asic->irq_base + i);
desc->handle_irq(asic->irq_base + i,
desc);
}
} }
} }