diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-18 02:17:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-19 04:24:57 -0500 |
commit | 5f6bd68ef539402b25e25d5e3324c59004541d77 (patch) | |
tree | 1e8de7864ba6a2000af5ac05739b69d9dd4c3cc8 /drivers/ide | |
parent | 293f18ad720f7c10f9f4b8a87827a1f0989e19ee (diff) |
alim15x3: remove superfluous locking from ali_set_pio_mode()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/alim15x3.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c index 4b47896df9f9..dabd986216fe 100644 --- a/drivers/ide/alim15x3.c +++ b/drivers/ide/alim15x3.c | |||
@@ -73,7 +73,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
73 | { | 73 | { |
74 | ide_hwif_t *hwif = drive->hwif; | 74 | ide_hwif_t *hwif = drive->hwif; |
75 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 75 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
76 | unsigned long flags; | ||
77 | int bus_speed = ide_pci_clk ? ide_pci_clk : 33; | 76 | int bus_speed = ide_pci_clk ? ide_pci_clk : 33; |
78 | unsigned long T = 1000000 / bus_speed; /* PCI clock based */ | 77 | unsigned long T = 1000000 / bus_speed; /* PCI clock based */ |
79 | int port = hwif->channel ? 0x5c : 0x58; | 78 | int port = hwif->channel ? 0x5c : 0x58; |
@@ -86,8 +85,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
86 | t.active = clamp_val(t.active, 1, 8) & 7; | 85 | t.active = clamp_val(t.active, 1, 8) & 7; |
87 | t.recover = clamp_val(t.recover, 1, 16) & 15; | 86 | t.recover = clamp_val(t.recover, 1, 16) & 15; |
88 | 87 | ||
89 | local_irq_save(flags); | ||
90 | |||
91 | /* | 88 | /* |
92 | * PIO mode => ATA FIFO on, ATAPI FIFO off | 89 | * PIO mode => ATA FIFO on, ATAPI FIFO off |
93 | */ | 90 | */ |
@@ -96,8 +93,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
96 | pci_write_config_byte(dev, port, t.setup); | 93 | pci_write_config_byte(dev, port, t.setup); |
97 | pci_write_config_byte(dev, port + unit + 2, | 94 | pci_write_config_byte(dev, port + unit + 2, |
98 | (t.active << 4) | t.recover); | 95 | (t.active << 4) | t.recover); |
99 | |||
100 | local_irq_restore(flags); | ||
101 | } | 96 | } |
102 | 97 | ||
103 | /** | 98 | /** |