Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185779
b: refs/heads/master
c: 5f6bd68
h: refs/heads/master
i:
  185777: 2eee978
  185775: 47cabdd
v: v3
  • Loading branch information
Bartlomiej Zolnierkiewicz authored and David S. Miller committed Jan 19, 2010
1 parent 3627e8b commit 315d930
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 293f18ad720f7c10f9f4b8a87827a1f0989e19ee
refs/heads/master: 5f6bd68ef539402b25e25d5e3324c59004541d77
5 changes: 0 additions & 5 deletions trunk/drivers/ide/alim15x3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
*/
Expand All @@ -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);
}

/**
Expand Down

0 comments on commit 315d930

Please sign in to comment.