Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

various char drivers: remove deprecated IRQF_DISABLED

Browse Source 
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>
This commit is contained in:
Michael Opdenacker 2013-10-13 06:14:42 +02:00 committed by Greg Kroah-Hartman
parent 158f0bb005
commit d88ed628f8
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/nwbutton.c
View File

@ -220,7 +220,7 @@ static int __init nwbutton_init(void)
return -EBUSY; return -EBUSY;
} }
if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, IRQF_DISABLED, if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, 0,
"nwbutton", NULL)) { "nwbutton", NULL)) {
printk (KERN_WARNING "nwbutton: IRQ %d is not free.\n", printk (KERN_WARNING "nwbutton: IRQ %d is not free.\n",
IRQ_NETWINDER_BUTTON); IRQ_NETWINDER_BUTTON);

5
drivers/char/rtc.c
View File

@ -227,7 +227,7 @@ static inline unsigned char rtc_is_updating(void)
#ifdef RTC_IRQ #ifdef RTC_IRQ
/* /*
* A very tiny interrupt handler. It runs with IRQF_DISABLED set, * A very tiny interrupt handler. It runs with interrupts disabled,
* but there is possibility of conflicting with the set_rtc_mmss() * but there is possibility of conflicting with the set_rtc_mmss()
* call (the rtc irq and the timer irq can easily run at the same * call (the rtc irq and the timer irq can easily run at the same
* time in two different CPUs). So we need to serialize * time in two different CPUs). So we need to serialize
@ -1040,8 +1040,7 @@ no_irq:
rtc_int_handler_ptr = rtc_interrupt; rtc_int_handler_ptr = rtc_interrupt;
} }
if (request_irq(RTC_IRQ, rtc_int_handler_ptr, IRQF_DISABLED, if (request_irq(RTC_IRQ, rtc_int_handler_ptr, 0, "rtc", NULL)) {
"rtc", NULL)) {
/* Yeah right, seeing as irq 8 doesn't even hit the bus. */ /* Yeah right, seeing as irq 8 doesn't even hit the bus. */
rtc_has_irq = 0; rtc_has_irq = 0;
printk(KERN_ERR "rtc: IRQ %d is not free.\n", RTC_IRQ); printk(KERN_ERR "rtc: IRQ %d is not free.\n", RTC_IRQ);

3
drivers/char/snsc.c
View File

@ -108,8 +108,7 @@ scdrv_open(struct inode *inode, struct file *file)
/* hook this subchannel up to the system controller interrupt */ /* hook this subchannel up to the system controller interrupt */
mutex_lock(&scdrv_mutex); mutex_lock(&scdrv_mutex);
rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt, rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt,
IRQF_SHARED | IRQF_DISABLED, IRQF_SHARED, SYSCTL_BASENAME, sd);
SYSCTL_BASENAME, sd);
if (rv) { if (rv) {
ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch); ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch);
kfree(sd); kfree(sd);

3
drivers/char/snsc_event.c
View File

@ -292,8 +292,7 @@ scdrv_event_init(struct sysctl_data_s *scd)
/* hook event subchannel up to the system controller interrupt */ /* hook event subchannel up to the system controller interrupt */
rv = request_irq(SGI_UART_VECTOR, scdrv_event_interrupt, rv = request_irq(SGI_UART_VECTOR, scdrv_event_interrupt,
IRQF_SHARED | IRQF_DISABLED, IRQF_SHARED, "system controller events", event_sd);
"system controller events", event_sd);
if (rv) { if (rv) {
printk(KERN_WARNING "%s: irq request failed (%d)\n", printk(KERN_WARNING "%s: irq request failed (%d)\n",
__func__, rv); __func__, rv);