diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-19 04:44:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-19 04:44:41 -0500 |
commit | e085b3cae85af47eb0a3eda3186bd898310fb322 (patch) | |
tree | 7f7fea27f1398558a63e58b2f52347ae93383bac /drivers/ide/scc_pata.c | |
parent | 3fccaa192b9501e79a57e02e62b6bf420d2b461e (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/scc_pata.c')
-rw-r--r-- | drivers/ide/scc_pata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index 1104bb301eb9..23e16e4460ee 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c | |||
@@ -199,16 +199,15 @@ scc_ide_outsl(unsigned long port, void *addr, u32 count) | |||
199 | 199 | ||
200 | /** | 200 | /** |
201 | * scc_set_pio_mode - set host controller for PIO mode | 201 | * scc_set_pio_mode - set host controller for PIO mode |
202 | * @hwif: port | ||
202 | * @drive: drive | 203 | * @drive: drive |
203 | * @pio: PIO mode number | ||
204 | * | 204 | * |
205 | * Load the timing settings for this device mode into the | 205 | * Load the timing settings for this device mode into the |
206 | * controller. | 206 | * controller. |
207 | */ | 207 | */ |
208 | 208 | ||
209 | static void scc_set_pio_mode(ide_drive_t *drive, const u8 pio) | 209 | static void scc_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
210 | { | 210 | { |
211 | ide_hwif_t *hwif = drive->hwif; | ||
212 | struct scc_ports *ports = ide_get_hwifdata(hwif); | 211 | struct scc_ports *ports = ide_get_hwifdata(hwif); |
213 | unsigned long ctl_base = ports->ctl; | 212 | unsigned long ctl_base = ports->ctl; |
214 | unsigned long cckctrl_port = ctl_base + 0xff0; | 213 | unsigned long cckctrl_port = ctl_base + 0xff0; |
@@ -216,6 +215,7 @@ static void scc_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
216 | unsigned long pioct_port = ctl_base + 0x004; | 215 | unsigned long pioct_port = ctl_base + 0x004; |
217 | unsigned long reg; | 216 | unsigned long reg; |
218 | int offset; | 217 | int offset; |
218 | const u8 pio = drive->pio_mode - XFER_PIO_0; | ||
219 | 219 | ||
220 | reg = in_be32((void __iomem *)cckctrl_port); | 220 | reg = in_be32((void __iomem *)cckctrl_port); |
221 | if (reg & CCKCTRL_ATACLKOEN) { | 221 | if (reg & CCKCTRL_ATACLKOEN) { |