summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-18 08:17:59 +0100
committerDavid S. Miller <davem@davemloft.net>2010-01-19 10:24:57 +0100
commit5f6bd68ef539402b25e25d5e3324c59004541d77 (patch)
tree1e8de7864ba6a2000af5ac05739b69d9dd4c3cc8
parentalim15x3: add ali_fifo_control() helper (diff)
downloadlinux-5f6bd68ef539402b25e25d5e3324c59004541d77.tar.xz
linux-5f6bd68ef539402b25e25d5e3324c59004541d77.zip
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>
-rw-r--r--drivers/ide/alim15x3.c5
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)
{
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev);
- unsigned long flags;
int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
unsigned long T = 1000000 / bus_speed; /* PCI clock based */
int port = hwif->channel ? 0x5c : 0x58;
@@ -86,8 +85,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
t.active = clamp_val(t.active, 1, 8) & 7;
t.recover = clamp_val(t.recover, 1, 16) & 15;
- local_irq_save(flags);
-
/*
* PIO mode => ATA FIFO on, ATAPI FIFO off
*/
@@ -96,8 +93,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
pci_write_config_byte(dev, port, t.setup);
pci_write_config_byte(dev, port + unit + 2,
(t.active << 4) | t.recover);
-
- local_irq_restore(flags);
}
/**