Deprecate SA_xxx interrupt flags -V2

The deprecation of the SA_xxx interrupt flags did not emit deprecated
warnings. Andrew said about the removal of the deprecated flag defines:

> This is going to break a lot of external stuff.  We should have found
> a way to make usage of SA_* emit deprecated warnings (or _some_
> warning) to warn people of impending doom.  But I can't immediately
> find a way of doing that. if we _can_ find a way of doing this, I
> suspect we'll need to do it, and give people another six months.  It's
> going to get ugly out there.  We shall see...

Define the deprecated flags as a call to a __deprecated inline function
so a warning is emitted on compile time.

Extend the reprieve of out of tree drivers to 9/2007.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 18 insertions, 12 deletions

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 2067a7ef6e62..80e63d8e9b15 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -54,20 +54,26 @@
 #define IRQF_NOBALANCING        0x00000800
 
 /*
- * Migration helpers. Scheduled for removal in 1/2007
+ * Migration helpers. Scheduled for removal in 9/2007
  * Do not use for new code !
  */
-#define SA_INTERRUPT            IRQF_DISABLED
-#define SA_SAMPLE_RANDOM        IRQF_SAMPLE_RANDOM
-#define SA_SHIRQ                IRQF_SHARED
-#define SA_PROBEIRQ             IRQF_PROBE_SHARED
-#define SA_PERCPU               IRQF_PERCPU
-
-#define SA_TRIGGER_LOW          IRQF_TRIGGER_LOW
-#define SA_TRIGGER_HIGH         IRQF_TRIGGER_HIGH
-#define SA_TRIGGER_FALLING      IRQF_TRIGGER_FALLING
-#define SA_TRIGGER_RISING       IRQF_TRIGGER_RISING
-#define SA_TRIGGER_MASK         IRQF_TRIGGER_MASK
+static inline
+unsigned long __deprecated deprecated_irq_flag(unsigned long flag)
+{
+        return flag;
+}
+
+#define SA_INTERRUPT            deprecated_irq_flag(IRQF_DISABLED)
+#define SA_SAMPLE_RANDOM        deprecated_irq_flag(IRQF_SAMPLE_RANDOM)
+#define SA_SHIRQ                deprecated_irq_flag(IRQF_SHARED)
+#define SA_PROBEIRQ             deprecated_irq_flag(IRQF_PROBE_SHARED)
+#define SA_PERCPU               deprecated_irq_flag(IRQF_PERCPU)
+
+#define SA_TRIGGER_LOW          deprecated_irq_flag(IRQF_TRIGGER_LOW)
+#define SA_TRIGGER_HIGH         deprecated_irq_flag(IRQF_TRIGGER_HIGH)
+#define SA_TRIGGER_FALLING      deprecated_irq_flag(IRQF_TRIGGER_FALLING)
+#define SA_TRIGGER_RISING       deprecated_irq_flag(IRQF_TRIGGER_RISING)
+#define SA_TRIGGER_MASK         deprecated_irq_flag(IRQF_TRIGGER_MASK)
 
 typedef irqreturn_t (*irq_handler_t)(int, void *);