mirror of
https://github.com/torvalds/linux.git
synced 2024-12-20 18:11:47 +00:00
ide: no need to touch local IRQs in ide_probe_port()
Remove superfluous local_save_flags() local_irq_enable_in_hardirq() ... local_irq_restore() combo. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
7a254df007
commit
d336ae3cf5
@ -779,7 +779,6 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave);
|
|||||||
static int ide_probe_port(ide_hwif_t *hwif)
|
static int ide_probe_port(ide_hwif_t *hwif)
|
||||||
{
|
{
|
||||||
ide_drive_t *drive;
|
ide_drive_t *drive;
|
||||||
unsigned long flags;
|
|
||||||
unsigned int irqd;
|
unsigned int irqd;
|
||||||
int i, rc = -ENODEV;
|
int i, rc = -ENODEV;
|
||||||
|
|
||||||
@ -797,9 +796,6 @@ static int ide_probe_port(ide_hwif_t *hwif)
|
|||||||
if (irqd)
|
if (irqd)
|
||||||
disable_irq(hwif->irq);
|
disable_irq(hwif->irq);
|
||||||
|
|
||||||
local_save_flags(flags);
|
|
||||||
local_irq_enable_in_hardirq();
|
|
||||||
|
|
||||||
if (ide_port_wait_ready(hwif) == -EBUSY)
|
if (ide_port_wait_ready(hwif) == -EBUSY)
|
||||||
printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
|
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;
|
rc = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
local_irq_restore(flags);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Use cached IRQ number. It might be (and is...) changed by probe
|
* Use cached IRQ number. It might be (and is...) changed by probe
|
||||||
* code above
|
* code above
|
||||||
|
Loading…
Reference in New Issue
Block a user