Commit e82cff75 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'irq-fixes-for-linus' of...

Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: NULL struct irq_desc's member 'name' in dynamic_irq_cleanup()
  genirq: fix off by one and coding style
  genirq: fix set_irq_type() when recording trigger type
parents b80de369 b6f3b780
...@@ -36,7 +36,7 @@ void ack_bad_irq(unsigned int irq) ...@@ -36,7 +36,7 @@ void ack_bad_irq(unsigned int irq)
} }
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# define irq_stats(x) (&per_cpu(irq_stat,x)) # define irq_stats(x) (&per_cpu(irq_stat, x))
#else #else
# define irq_stats(x) cpu_pda(x) # define irq_stats(x) cpu_pda(x)
#endif #endif
...@@ -113,7 +113,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -113,7 +113,7 @@ int show_interrupts(struct seq_file *p, void *v)
if (i == 0) { if (i == 0) {
seq_printf(p, " "); seq_printf(p, " ");
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "CPU%-8d",j); seq_printf(p, "CPU%-8d", j);
seq_putc(p, '\n'); seq_putc(p, '\n');
} }
......
...@@ -14,8 +14,8 @@ extern int nr_irqs; ...@@ -14,8 +14,8 @@ extern int nr_irqs;
for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++) for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++)
# define for_each_irq_desc_reverse(irq, desc) \ # define for_each_irq_desc_reverse(irq, desc) \
for (irq = nr_irqs -1, desc = irq_desc + (nr_irqs -1 ); \ for (irq = nr_irqs - 1, desc = irq_desc + (nr_irqs - 1); \
irq > 0; irq--, desc--) irq >= 0; irq--, desc--)
#endif #endif
#define for_each_irq_nr(irq) \ #define for_each_irq_nr(irq) \
......
...@@ -76,6 +76,7 @@ void dynamic_irq_cleanup(unsigned int irq) ...@@ -76,6 +76,7 @@ void dynamic_irq_cleanup(unsigned int irq)
desc->chip_data = NULL; desc->chip_data = NULL;
desc->handle_irq = handle_bad_irq; desc->handle_irq = handle_bad_irq;
desc->chip = &no_irq_chip; desc->chip = &no_irq_chip;
desc->name = NULL;
spin_unlock_irqrestore(&desc->lock, flags); spin_unlock_irqrestore(&desc->lock, flags);
} }
...@@ -127,7 +128,7 @@ int set_irq_type(unsigned int irq, unsigned int type) ...@@ -127,7 +128,7 @@ int set_irq_type(unsigned int irq, unsigned int type)
return 0; return 0;
spin_lock_irqsave(&desc->lock, flags); spin_lock_irqsave(&desc->lock, flags);
ret = __irq_set_trigger(desc, irq, flags); ret = __irq_set_trigger(desc, irq, type);
spin_unlock_irqrestore(&desc->lock, flags); spin_unlock_irqrestore(&desc->lock, flags);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment