redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] irq-flags: ide: Use the new IRQF_ constants

Browse source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Thomas Gleixner 2006-07-01 19:29:34 -07:00 committed by Linus Torvalds
parent 935f6e3abc
commit 362537b9ab
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/ide/ide-probe.c
View file

@ -1004,7 +1004,7 @@ static int ide_init_queue(ide_drive_t *drive)
* and irq serialization situations. This is somewhat complex because * and irq serialization situations. This is somewhat complex because
* it handles static as well as dynamic (PCMCIA) IDE interfaces. * it handles static as well as dynamic (PCMCIA) IDE interfaces.
* *
* The SA_INTERRUPT in sa_flags means ide_intr() is always entered with * The IRQF_DISABLED in sa_flags means ide_intr() is always entered with
* interrupts completely disabled. This can be bad for interrupt latency, * interrupts completely disabled. This can be bad for interrupt latency,
* but anything else has led to problems on some machines. We re-enable * but anything else has led to problems on some machines. We re-enable
* interrupts as much as we can safely do in most places. * interrupts as much as we can safely do in most places.
@ -1090,15 +1090,15 @@ static int init_irq (ide_hwif_t *hwif)
* Allocate the irq, if not already obtained for another hwif * Allocate the irq, if not already obtained for another hwif
*/ */
if (!match || match->irq != hwif->irq) { if (!match || match->irq != hwif->irq) {
int sa = SA_INTERRUPT; int sa = IRQF_DISABLED;
#if defined(__mc68000__) || defined(CONFIG_APUS) #if defined(__mc68000__) || defined(CONFIG_APUS)
sa = SA_SHIRQ; sa = IRQF_SHARED;
#endif /* __mc68000__ || CONFIG_APUS */ #endif /* __mc68000__ || CONFIG_APUS */
if (IDE_CHIPSET_IS_PCI(hwif->chipset)) { if (IDE_CHIPSET_IS_PCI(hwif->chipset)) {
sa = SA_SHIRQ; sa = IRQF_SHARED;
#ifndef CONFIG_IDEPCI_SHARE_IRQ #ifndef CONFIG_IDEPCI_SHARE_IRQ
sa |= SA_INTERRUPT; sa |= IRQF_DISABLED;
#endif /* CONFIG_IDEPCI_SHARE_IRQ */ #endif /* CONFIG_IDEPCI_SHARE_IRQ */
} }

4
drivers/ide/legacy/hd.c
View file

@ -691,7 +691,7 @@ static struct block_device_operations hd_fops = {
}; };
/* /*
* This is the hard disk IRQ description. The SA_INTERRUPT in sa_flags * This is the hard disk IRQ description. The IRQF_DISABLED in sa_flags
* means we run the IRQ-handler with interrupts disabled: this is bad for * means we run the IRQ-handler with interrupts disabled: this is bad for
* interrupt latency, but anything else has led to problems on some * interrupt latency, but anything else has led to problems on some
* machines. * machines.
@ -806,7 +806,7 @@ static int __init hd_init(void)
p->cyl, p->head, p->sect); p->cyl, p->head, p->sect);
} }
if (request_irq(HD_IRQ, hd_interrupt, SA_INTERRUPT, "hd", NULL)) { if (request_irq(HD_IRQ, hd_interrupt, IRQF_DISABLED, "hd", NULL)) {
printk("hd: unable to get IRQ%d for the hard disk driver\n", printk("hd: unable to get IRQ%d for the hard disk driver\n",
HD_IRQ); HD_IRQ);
goto out1; goto out1;