Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

various char drivers: remove deprecated IRQF_DISABLED

This patch proposes to remove the use of the IRQF_DISABLED flag

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Michael Opdenacker and committed by
Greg Kroah-Hartman
d88ed628 158f0bb0

+5 -8
+1 -1
drivers/char/nwbutton.c
··· 220 220 return -EBUSY; 221 221 } 222 222 223 - if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, IRQF_DISABLED, 223 + if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, 0, 224 224 "nwbutton", NULL)) { 225 225 printk (KERN_WARNING "nwbutton: IRQ %d is not free.\n", 226 226 IRQ_NETWINDER_BUTTON);
+2 -3
drivers/char/rtc.c
··· 227 227 228 228 #ifdef RTC_IRQ 229 229 /* 230 - * A very tiny interrupt handler. It runs with IRQF_DISABLED set, 230 + * A very tiny interrupt handler. It runs with interrupts disabled, 231 231 * but there is possibility of conflicting with the set_rtc_mmss() 232 232 * call (the rtc irq and the timer irq can easily run at the same 233 233 * time in two different CPUs). So we need to serialize ··· 1040 1040 rtc_int_handler_ptr = rtc_interrupt; 1041 1041 } 1042 1042 1043 - if (request_irq(RTC_IRQ, rtc_int_handler_ptr, IRQF_DISABLED, 1044 - "rtc", NULL)) { 1043 + if (request_irq(RTC_IRQ, rtc_int_handler_ptr, 0, "rtc", NULL)) { 1045 1044 /* Yeah right, seeing as irq 8 doesn't even hit the bus. */ 1046 1045 rtc_has_irq = 0; 1047 1046 printk(KERN_ERR "rtc: IRQ %d is not free.\n", RTC_IRQ);
+1 -2
drivers/char/snsc.c
··· 108 108 /* hook this subchannel up to the system controller interrupt */ 109 109 mutex_lock(&scdrv_mutex); 110 110 rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt, 111 - IRQF_SHARED | IRQF_DISABLED, 112 - SYSCTL_BASENAME, sd); 111 + IRQF_SHARED, SYSCTL_BASENAME, sd); 113 112 if (rv) { 114 113 ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch); 115 114 kfree(sd);
+1 -2
drivers/char/snsc_event.c
··· 292 292 293 293 /* hook event subchannel up to the system controller interrupt */ 294 294 rv = request_irq(SGI_UART_VECTOR, scdrv_event_interrupt, 295 - IRQF_SHARED | IRQF_DISABLED, 296 - "system controller events", event_sd); 295 + IRQF_SHARED, "system controller events", event_sd); 297 296 if (rv) { 298 297 printk(KERN_WARNING "%s: irq request failed (%d)\n", 299 298 __func__, rv);