]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ide: no need to touch local IRQs in ide_probe_port()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 24 Mar 2009 22:22:39 +0000 (23:22 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 24 Mar 2009 22:22:39 +0000 (23:22 +0100)
Remove superfluous

local_save_flags()
local_irq_enable_in_hardirq()

...

local_irq_restore()

combo.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-probe.c

index 97ea5328c8e9adf2d773194809d30cdd784299e1..eebd4ed29062120f6cba0b4a0ddcc02cfb04df31 100644 (file)
@@ -779,7 +779,6 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave);
 static int ide_probe_port(ide_hwif_t *hwif)
 {
        ide_drive_t *drive;
-       unsigned long flags;
        unsigned int irqd;
        int i, rc = -ENODEV;
 
@@ -797,9 +796,6 @@ static int ide_probe_port(ide_hwif_t *hwif)
        if (irqd)
                disable_irq(hwif->irq);
 
-       local_save_flags(flags);
-       local_irq_enable_in_hardirq();
-
        if (ide_port_wait_ready(hwif) == -EBUSY)
                printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
 
@@ -813,8 +809,6 @@ static int ide_probe_port(ide_hwif_t *hwif)
                        rc = 0;
        }
 
-       local_irq_restore(flags);
-
        /*
         * Use cached IRQ number. It might be (and is...) changed by probe
         * code above