Completely remove deprecated IRQ flags (SA_*)
Subsystems (3)
PATCH 1/3 Completely remove deprecated IRQ flags (SA_*)
Hi all,
Only very little files use the deprecated SA_* IRQ flags in latest pull. This minimal patch series removes such macros from the tree and transfrom old code to the new IRQF_* flags.
Andrew, I've grepped the whole tree to make sure that no more files than the patched ones use such deprecated macros. I hope this series won't introduce build errors.
Patches can be applied cleanly on v2.6.23-rc8.
==>
Get rid of the deprecated SA_* IRQ flags.
Signed-off-by Ahmed S. Darwish <[email protected]>
---
include/linux/interrupt.h +0 -22
@@ -55,28 +55,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 {
Regards,
Signature · 3 lines
Ahmed S. Darwish HomePage: http://darwish.07.googlepages.com Blog: http://darwish-07.blogspot.com
PATCH 2/3 MIPS: Remove deprecated IRQ flags (SA_*)
Hi Ralf,
A patch to stop using deprecated IRQ flags. The new IRQF_* macros are used instead.
Signed-off-by Ahmed S. Darwish <[email protected]>
---
arch/mips/pci/ops-pmcmsp.c +1 -1
@@ -404,7 +404,7 @@ int msp_pcibios_config_access(unsigned char access_type,if (pciirqflag ==0 ) {request_irq (MSP_INT_PCI ,/* Hardcoded internal MSP7120 wiring */ bpci_interrupt, -SA_SHIRQ |SA_INTERRUPT , +IRQF_SHARED |IRQF_DISABLED ,"PMC MSP PCI Host" , preg); pciirqflag = ~0 ;
arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c +1 -1
@@ -163,7 +163,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)CIC_EXT_SET_ACTIVE_HI (cic_ext, hirq->eirq); *CIC_EXT_CFG_REG = cic_ext; -return request_irq (hirq->irq, hwbutton_handler,SA_INTERRUPT , +return request_irq (hirq->irq, hwbutton_handler,IRQF_DISABLED , hirq->name, (void *)hirq); }
Signature · 3 lines
Ahmed S. Darwish HomePage: http://darwish.07.googlepages.com Blog: http://darwish-07.blogspot.com
Re: [PATCH 2/3] MIPS: Remove deprecated IRQ flags (SA_*)
Quoted 2 lines · Ahmed S. Darwish
A patch to stop using deprecated IRQ flags. The new IRQF_* macros are used instead.
Thanks, queued for 2.6.24.
Ralf
PATCH 3/3 NCR53C8XX: Remove deprecated IRQ flags (SA_*)
In reply to Ahmed S. DarwishHi Matthew,
A patch to stop using deprecated IRQ flags in ncr53c8xx documentaion. The new IRQF_* macros are used instead.
Signed-off-by Ahmed S. Darwish <[email protected]>
---
Documentation/scsi/ChangeLog.ncr53c8xx +3 -3
@@ -195,9 +195,9 @@ Sun Feb 14:00 1999 Gerard Roudier ([email protected]) Pointed out by Leonard Zubkoff. - Allow to tune request_irq() flags from the boot command line using ncr53c8xx=irqm:??, as follows: - a) If bit 0x10 is set in irqm, SA_SHIRQ flag is not used. - b) If bit 0x20 is set in irqm, SA_INTERRUPT flag is not used. - By default the driver uses both SA_SHIRQ and SA_INTERRUPT. + a) If bit 0x10 is set in irqm, IRQF_SHARED flag is not used. + b) If bit 0x20 is set in irqm, IRQF_DISABLED flag is not used. + By default the driver uses both IRQF_SHARED and IRQF_DISABLED. Option 'ncr53c8xx=irqm:0x20' may be used when an IRQ is shared by a 53C8XX adapter and a network board. - Tiny mispelling fixed (ABORT instead of ABRT). Was fortunately
Documentation/scsi/ncr53c8xx.txt +7 -7
@@ -785,8 +785,8 @@ port address 0x1400. irqm:0 always open drain irqm:1 same as initial settings (assumed BIOS settings) irqm:2 always totem pole - irqm:0x10 driver will not use SA_SHIRQ flag when requesting irq - irqm:0x20 driver will not use SA_INTERRUPT flag when requesting irq + irqm:0x10 driver will not use IRQF_SHARED flag when requesting irq + irqm:0x20 driver will not use IRQF_DISABLED flag when requesting irq (Bits 0x10 and 0x20 can be combined with hardware irq mode option)
@@ -1236,15 +1236,15 @@ when the SCSI DATA IN phase is reentered after a phase mismatch. When an IRQ is shared by devices that are handled by different drivers, it may happen that one driver complains about the request of the IRQ having failed. Inder Linux-2.0, this may be due to one driver having requested the -IRQ using the SA_INTERRUPT flag but some other having requested the same IRQ +IRQ using the IRQF_DISABLED flag but some other having requested the same IRQ without this flag. Under both Linux-2.0 and linux-2.2, this may be caused by -one driver not having requested the IRQ with the SA_SHIRQ flag. +one driver not having requested the IRQ with the IRQF_SHARED flag. By default, the ncr53c8xx and sym53c8xx drivers request IRQs with both the -SA_INTERRUPT and the SA_SHIRQ flag under Linux-2.0 and with only the SA_SHIRQ +IRQF_DISABLED and the IRQF_SHARED flag under Linux-2.0 and with only the IRQF_SHARED flag under Linux-2.2. -Under Linux-2.0, you can disable use of SA_INTERRUPT flag from the boot +Under Linux-2.0, you can disable use of IRQF_DISABLED flag from the boot command line by using the following option: ncr53c8xx=irqm:0x20 (for the generic ncr53c8xx driver)
@@ -1252,7 +1252,7 @@ command line by using the following option: If this does not fix the problem, then you may want to check how all other drivers are requesting the IRQ and report the problem. Note that if at least -a single driver does not request the IRQ with the SA_SHIRQ flag (share IRQ), +a single driver does not request the IRQ with the IRQF_SHARED flag (share IRQ), then the request of the IRQ obviously will not succeed for all the drivers. 15. SCSI problem troubleshooting
Signature · 3 lines
Ahmed S. Darwish HomePage: http://darwish.07.googlepages.com Blog: http://darwish-07.blogspot.com