Commit d8179bc0db8d0c9654d5de43de2874bf6d0a58fa
1 parent
4debd723f4
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
genirq: Remove dynamic_irq mess
No more users. Get rid of the cruft. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Grant Likely <grant.likely@linaro.org> Tested-by: Tony Luck <tony.luck@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20140507154341.012847637@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Showing 2 changed files with 7 additions and 26 deletions Side-by-side Diff
include/linux/irq.h
| ... | ... | @@ -525,16 +525,6 @@ |
| 525 | 525 | IRQ_NOPROBE | IRQ_PER_CPU_DEVID); |
| 526 | 526 | } |
| 527 | 527 | |
| 528 | -/* | |
| 529 | - * Dynamic irq helper functions. Obsolete. Use irq_alloc_desc* and | |
| 530 | - * irq_free_desc instead. | |
| 531 | - */ | |
| 532 | -extern void dynamic_irq_cleanup(unsigned int irq); | |
| 533 | -static inline void dynamic_irq_init(unsigned int irq) | |
| 534 | -{ | |
| 535 | - dynamic_irq_cleanup(irq); | |
| 536 | -} | |
| 537 | - | |
| 538 | 528 | /* Set/get chip/data for an IRQ: */ |
| 539 | 529 | extern int irq_set_chip(unsigned int irq, struct irq_chip *chip); |
| 540 | 530 | extern int irq_set_handler_data(unsigned int irq, void *data); |
kernel/irq/irqdesc.c
| ... | ... | @@ -278,7 +278,12 @@ |
| 278 | 278 | |
| 279 | 279 | static void free_desc(unsigned int irq) |
| 280 | 280 | { |
| 281 | - dynamic_irq_cleanup(irq); | |
| 281 | + struct irq_desc *desc = irq_to_desc(irq); | |
| 282 | + unsigned long flags; | |
| 283 | + | |
| 284 | + raw_spin_lock_irqsave(&desc->lock, flags); | |
| 285 | + desc_set_defaults(irq, desc, desc_node(desc), NULL); | |
| 286 | + raw_spin_unlock_irqrestore(&desc->lock, flags); | |
| 282 | 287 | } |
| 283 | 288 | |
| 284 | 289 | static inline int alloc_descs(unsigned int start, unsigned int cnt, int node, |
| ... | ... | @@ -309,7 +314,7 @@ |
| 309 | 314 | #ifdef CONFIG_GENERIC_IRQ_LEGACY |
| 310 | 315 | void irq_init_desc(unsigned int irq) |
| 311 | 316 | { |
| 312 | - dynamic_irq_cleanup(irq); | |
| 317 | + free_desc(irq); | |
| 313 | 318 | } |
| 314 | 319 | #endif |
| 315 | 320 | |
| ... | ... | @@ -520,20 +525,6 @@ |
| 520 | 525 | |
| 521 | 526 | irq_set_percpu_devid_flags(irq); |
| 522 | 527 | return 0; |
| 523 | -} | |
| 524 | - | |
| 525 | -/** | |
| 526 | - * dynamic_irq_cleanup - cleanup a dynamically allocated irq | |
| 527 | - * @irq: irq number to initialize | |
| 528 | - */ | |
| 529 | -void dynamic_irq_cleanup(unsigned int irq) | |
| 530 | -{ | |
| 531 | - struct irq_desc *desc = irq_to_desc(irq); | |
| 532 | - unsigned long flags; | |
| 533 | - | |
| 534 | - raw_spin_lock_irqsave(&desc->lock, flags); | |
| 535 | - desc_set_defaults(irq, desc, desc_node(desc), NULL); | |
| 536 | - raw_spin_unlock_irqrestore(&desc->lock, flags); | |
| 537 | 528 | } |
| 538 | 529 | |
| 539 | 530 | void kstat_incr_irq_this_cpu(unsigned int irq) |