aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/cy82c693.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-19 04:44:41 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-19 04:44:41 -0500
commite085b3cae85af47eb0a3eda3186bd898310fb322 (patch)
tree7f7fea27f1398558a63e58b2f52347ae93383bac /drivers/ide/cy82c693.c
parent3fccaa192b9501e79a57e02e62b6bf420d2b461e (diff)
ide: change ->set_pio_mode method parameters
Change ->set_pio_mode method parameters to match ->set_piomode method used in struct ata_port_operations. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide/cy82c693.c')
-rw-r--r--drivers/ide/cy82c693.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
index fbf3dcc26577..ead65c394f00 100644
--- a/drivers/ide/cy82c693.c
+++ b/drivers/ide/cy82c693.c
@@ -80,9 +80,8 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)
80 outb(data, CY82_DATA_PORT); 80 outb(data, CY82_DATA_PORT);
81} 81}
82 82
83static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio) 83static void cy82c693_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
84{ 84{
85 ide_hwif_t *hwif = drive->hwif;
86 struct pci_dev *dev = to_pci_dev(hwif->dev); 85 struct pci_dev *dev = to_pci_dev(hwif->dev);
87 int bus_speed = ide_pci_clk ? ide_pci_clk : 33; 86 int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
88 const unsigned long T = 1000000 / bus_speed; 87 const unsigned long T = 1000000 / bus_speed;
@@ -101,7 +100,7 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
101 } 100 }
102 } 101 }
103 102
104 ide_timing_compute(drive, XFER_PIO_0 + pio, &t, T, 1); 103 ide_timing_compute(drive, drive->pio_mode, &t, T, 1);
105 104
106 time_16 = clamp_val(t.recover - 1, 0, 15) | 105 time_16 = clamp_val(t.recover - 1, 0, 15) |
107 (clamp_val(t.active - 1, 0, 15) << 4); 106 (clamp_val(t.active - 1, 0, 15) << 4);