diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-10 05:36:33 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:06 -0500 |
commit | a0cd9ca2b907d7ee26575e7b63ac92dad768a75e (patch) | |
tree | 4b46f7951b9cd76531caf6d4d68d687e1b622336 /include/linux/interrupt.h | |
parent | 43abe43ce0619d744c7a5bb15cce075e532b53b7 (diff) |
genirq: Namespace cleanup
The irq namespace has become quite convoluted. My bad. Clean it up
and deprecate the old functions. All new functions follow the scheme:
irq number based:
irq_set/get/xxx/_xxx(unsigned int irq, ...)
irq_data based:
irq_data_set/get/xxx/_xxx(struct irq_data *d, ....)
irq_desc based:
irq_desc_get_xxx(struct irq_desc *desc)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/interrupt.h')
-rw-r--r-- | include/linux/interrupt.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 56b7c97aaf0a..7834726dd95b 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
@@ -346,16 +346,24 @@ static inline void enable_irq_lockdep_irqrestore(unsigned int irq, unsigned long | |||
346 | } | 346 | } |
347 | 347 | ||
348 | /* IRQ wakeup (PM) control: */ | 348 | /* IRQ wakeup (PM) control: */ |
349 | extern int set_irq_wake(unsigned int irq, unsigned int on); | 349 | extern int irq_set_irq_wake(unsigned int irq, unsigned int on); |
350 | |||
351 | #ifndef CONFIG_GENERIC_HARDIRQS_NO_COMPAT | ||
352 | /* Please do not use: Use the replacement functions instead */ | ||
353 | static inline int set_irq_wake(unsigned int irq, unsigned int on) | ||
354 | { | ||
355 | return irq_set_irq_wake(irq, on); | ||
356 | } | ||
357 | #endif | ||
350 | 358 | ||
351 | static inline int enable_irq_wake(unsigned int irq) | 359 | static inline int enable_irq_wake(unsigned int irq) |
352 | { | 360 | { |
353 | return set_irq_wake(irq, 1); | 361 | return irq_set_irq_wake(irq, 1); |
354 | } | 362 | } |
355 | 363 | ||
356 | static inline int disable_irq_wake(unsigned int irq) | 364 | static inline int disable_irq_wake(unsigned int irq) |
357 | { | 365 | { |
358 | return set_irq_wake(irq, 0); | 366 | return irq_set_irq_wake(irq, 0); |
359 | } | 367 | } |
360 | 368 | ||
361 | #else /* !CONFIG_GENERIC_HARDIRQS */ | 369 | #else /* !CONFIG_GENERIC_HARDIRQS */ |