diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 18:22:39 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 18:22:39 -0400 |
commit | d336ae3cf567185fb8fc03c10e9394920f7d5ab1 (patch) | |
tree | c021d4e4a4c3e072a4a49497cfbb3acb93bc446a /drivers/ide/ide-probe.c | |
parent | 7a254df007b3db88bd430474030fec92e7bab22a (diff) |
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>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 97ea5328c8e9..eebd4ed29062 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -779,7 +779,6 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave); | |||
779 | static int ide_probe_port(ide_hwif_t *hwif) | 779 | static int ide_probe_port(ide_hwif_t *hwif) |
780 | { | 780 | { |
781 | ide_drive_t *drive; | 781 | ide_drive_t *drive; |
782 | unsigned long flags; | ||
783 | unsigned int irqd; | 782 | unsigned int irqd; |
784 | int i, rc = -ENODEV; | 783 | int i, rc = -ENODEV; |
785 | 784 | ||
@@ -797,9 +796,6 @@ static int ide_probe_port(ide_hwif_t *hwif) | |||
797 | if (irqd) | 796 | if (irqd) |
798 | disable_irq(hwif->irq); | 797 | disable_irq(hwif->irq); |
799 | 798 | ||
800 | local_save_flags(flags); | ||
801 | local_irq_enable_in_hardirq(); | ||
802 | |||
803 | if (ide_port_wait_ready(hwif) == -EBUSY) | 799 | if (ide_port_wait_ready(hwif) == -EBUSY) |
804 | printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name); | 800 | printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name); |
805 | 801 | ||
@@ -813,8 +809,6 @@ static int ide_probe_port(ide_hwif_t *hwif) | |||
813 | rc = 0; | 809 | rc = 0; |
814 | } | 810 | } |
815 | 811 | ||
816 | local_irq_restore(flags); | ||
817 | |||
818 | /* | 812 | /* |
819 | * Use cached IRQ number. It might be (and is...) changed by probe | 813 | * Use cached IRQ number. It might be (and is...) changed by probe |
820 | * code above | 814 | * code above |