Remove the few remaining traces of the interrupt-related "SA_" flags,
which were scheduled for official deletion in September of 2007,
anyway.
Signed-off-by: Robert P. J. Day <[email protected]>
---
there's little point in leaving this cruft in the tree since there
were only two instances of the deprecated flags left and since the
comment clearly states that the old flags were *not* to be used for
new code, there's no point continuing to support them once there are
no instances left in the tree.
note: this is just an RFC since there are still random comments
sprinkled around the tree referring to things like SA_INTERRUPT, so
this patch can still be prettied up a bit.
Documentation/feature-removal-schedule.txt | 9 -------
drivers/misc/tifm_7xx1.c | 2 -
drivers/usb/gadget/fsl_usb2_udc.c | 2 -
include/linux/interrupt.h | 22 -------------------
4 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 498ff31..c5d7775 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -160,15 +160,6 @@ Who: Greg Kroah-Hartman <[email protected]>
---------------------------
-What: Interrupt only SA_* flags
-When: September 2007
-Why: The interrupt related SA_* flags are replaced by IRQF_* to move them
- out of the signal namespace.
-
-Who: Thomas Gleixner <[email protected]>
-
----------------------------
-
What: PHYSDEVPATH, PHYSDEVBUS, PHYSDEVDRIVER in the uevent environment
When: October 2008
Why: The stacking of class devices makes these values misleading and
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index c08ad8f..2d1b3df 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -343,7 +343,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev,
if (!fm->addr)
goto err_out_free;
- rc = request_irq(dev->irq, tifm_7xx1_isr, SA_SHIRQ, DRIVER_NAME, fm);
+ rc = request_irq(dev->irq, tifm_7xx1_isr, IRQF_SHARED, DRIVER_NAME, fm);
if (rc)
goto err_out_unmap;
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index 157054e..7f07a27 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -2332,7 +2332,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
goto err2;
}
- ret = request_irq(udc_controller->irq, fsl_udc_irq, SA_SHIRQ,
+ ret = request_irq(udc_controller->irq, fsl_udc_irq, IRQF_SHARED,
driver_name, udc_controller);
if (ret != 0) {
ERR("cannot request irq %d err %d \n",
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 5323f62..f048241 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -57,28 +57,6 @@
#define IRQF_NOBALANCING 0x00000800
#define IRQF_IRQPOLL 0x00001000
-/*
- * Migration helpers. Scheduled for removal in 9/2007
- * Do not use for new code !
- */
-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 *);
struct irqaction {
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA
http://fsdev.net/wiki/index.php?title=Main_Page
========================================================================
On Mon, 2007-05-14 at 14:38 -0400, Robert P. J. Day wrote:
> diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
> index 498ff31..c5d7775 100644
> --- a/Documentation/feature-removal-schedule.txt
> +++ b/Documentation/feature-removal-schedule.txt
> @@ -160,15 +160,6 @@ Who: Greg Kroah-Hartman <[email protected]>
>
> ---------------------------
>
> -What: Interrupt only SA_* flags
> -When: September 2007
> -Why: The interrupt related SA_* flags are replaced by IRQF_* to move them
> - out of the signal namespace.
> -
> -Who: Thomas Gleixner <[email protected]>
> -
NAK, the removal date is September 2007 so out of tree folks have some
time to fix their crap.
tglx
Thomas Gleixner wrote:
> On Mon, 2007-05-14 at 14:38 -0400, Robert P. J. Day wrote:
>
>> diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
>> index 498ff31..c5d7775 100644
>> --- a/Documentation/feature-removal-schedule.txt
>> +++ b/Documentation/feature-removal-schedule.txt
>> @@ -160,15 +160,6 @@ Who: Greg Kroah-Hartman <[email protected]>
>>
>> ---------------------------
>>
>> -What: Interrupt only SA_* flags
>> -When: September 2007
>> -Why: The interrupt related SA_* flags are replaced by IRQF_* to move them
>> - out of the signal namespace.
>> -
>> -Who: Thomas Gleixner <[email protected]>
>> -
>>
>
> NAK, the removal date is September 2007 so out of tree folks have some
> time to fix their crap.
This might be a good example of targeting a specific kernel version
rather than a date, since anyone who can't fix this immediately with a
simple search'n'replace is probably trying to support multiple kernels,
and knowing that "2.6.24" (or whatever) is the cut-off version is more
useful than "whatever kernel is current in Sept 2007".
J
On Mon, 2007-05-14 at 12:06 -0700, Jeremy Fitzhardinge wrote:
> > NAK, the removal date is September 2007 so out of tree folks have some
> > time to fix their crap.
>
> This might be a good example of targeting a specific kernel version
> rather than a date, since anyone who can't fix this immediately with a
> simple search'n'replace is probably trying to support multiple kernels,
> and knowing that "2.6.24" (or whatever) is the cut-off version is more
> useful than "whatever kernel is current in Sept 2007".
Makes sense. OTOH folks can do the math on their own :)
tglx
On Mon, May 14, 2007 at 12:06:12PM -0700, Jeremy Fitzhardinge wrote:
> Thomas Gleixner wrote:
> > On Mon, 2007-05-14 at 14:38 -0400, Robert P. J. Day wrote:
> >
> >> diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
> >> index 498ff31..c5d7775 100644
> >> --- a/Documentation/feature-removal-schedule.txt
> >> +++ b/Documentation/feature-removal-schedule.txt
> >> @@ -160,15 +160,6 @@ Who: Greg Kroah-Hartman <[email protected]>
> >>
> >> ---------------------------
> >>
> >> -What: Interrupt only SA_* flags
> >> -When: September 2007
> >> -Why: The interrupt related SA_* flags are replaced by IRQF_* to move them
> >> - out of the signal namespace.
> >> -
> >> -Who: Thomas Gleixner <[email protected]>
> >> -
> >>
> >
> > NAK, the removal date is September 2007 so out of tree folks have some
> > time to fix their crap.
>
> This might be a good example of targeting a specific kernel version
> rather than a date, since anyone who can't fix this immediately with a
> simple search'n'replace is probably trying to support multiple kernels,
> and knowing that "2.6.24" (or whatever) is the cut-off version is more
> useful than "whatever kernel is current in Sept 2007".
Given that it's only just gone in, it's going to take a while for it to
trickle through peoples conciousnesses. Many people aren't aware of this
change yet - I'm picking people up when I review their patches at the
moment.
September 2007 should, by my estimation, be around the time of the
2.6.23-rc releases, so people have two kernel versions to fix their stuff
up. That's not unreasonable.
Finally, a date by when people have to have their code updated or it
breaks is more managable from the point of view of planning - you
know when it's potentially going to happen. You don't know when the
2.6.23 release is going to be, except "sometime in the last half of
this year."
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: