mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-11 07:39:47 +00:00
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>
This commit is contained in:
parent
293f18ad72
commit
5f6bd68ef5
@ -73,7 +73,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
|
|||||||
{
|
{
|
||||||
ide_hwif_t *hwif = drive->hwif;
|
ide_hwif_t *hwif = drive->hwif;
|
||||||
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
||||||
unsigned long flags;
|
|
||||||
int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
|
int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
|
||||||
unsigned long T = 1000000 / bus_speed; /* PCI clock based */
|
unsigned long T = 1000000 / bus_speed; /* PCI clock based */
|
||||||
int port = hwif->channel ? 0x5c : 0x58;
|
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.active = clamp_val(t.active, 1, 8) & 7;
|
||||||
t.recover = clamp_val(t.recover, 1, 16) & 15;
|
t.recover = clamp_val(t.recover, 1, 16) & 15;
|
||||||
|
|
||||||
local_irq_save(flags);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* PIO mode => ATA FIFO on, ATAPI FIFO off
|
* 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, t.setup);
|
||||||
pci_write_config_byte(dev, port + unit + 2,
|
pci_write_config_byte(dev, port + unit + 2,
|
||||||
(t.active << 4) | t.recover);
|
(t.active << 4) | t.recover);
|
||||||
|
|
||||||
local_irq_restore(flags);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user