Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 362537b9 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarThomas 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 935f6e3a

drivers/ide/ide-probe.c

+5 −5
Original line number Diff line number Diff line
@@ -1004,7 +1004,7 @@ static int ide_init_queue(ide_drive_t *drive) 
 * and irq serialization situations.  This is somewhat complex because

 * 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,

 * but anything else has led to problems on some machines.  We re-enable

 * 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

	 */

	if (!match || match->irq != hwif->irq) {

		int sa = SA_INTERRUPT;

		int sa = IRQF_DISABLED;

#if defined(__mc68000__) || defined(CONFIG_APUS)

		sa = SA_SHIRQ;

		sa = IRQF_SHARED;

#endif /* __mc68000__ || CONFIG_APUS */



		if (IDE_CHIPSET_IS_PCI(hwif->chipset)) {

			sa = SA_SHIRQ;

			sa = IRQF_SHARED;

#ifndef CONFIG_IDEPCI_SHARE_IRQ

			sa |= SA_INTERRUPT;

			sa |= IRQF_DISABLED;

#endif /* CONFIG_IDEPCI_SHARE_IRQ */

		}

drivers/ide/legacy/hd.c

+2 −2
Original line number Diff line number Diff line
@@ -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

 * interrupt latency, but anything else has led to problems on some

 * machines.
@@ -806,7 +806,7 @@ static int __init hd_init(void) 
			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",

			HD_IRQ);

		goto out1;