diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-19 04:45:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-19 04:45:29 -0500 |
commit | 8776168ca2151850164af1de5565d01f7b8b2c53 (patch) | |
tree | 28a44a3a649e1ab98f89674a06cc4c135a16d243 /drivers/ide/scc_pata.c | |
parent | e085b3cae85af47eb0a3eda3186bd898310fb322 (diff) |
ide: change ->set_dma_mode method parameters
Change ->set_dma_mode method parameters to match ->set_dmamode method
used in struct ata_port_operations.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
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 23e16e4460ee..e9d4b441d1c3 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c | |||
@@ -231,16 +231,15 @@ static void scc_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) | |||
231 | 231 | ||
232 | /** | 232 | /** |
233 | * scc_set_dma_mode - set host controller for DMA mode | 233 | * scc_set_dma_mode - set host controller for DMA mode |
234 | * @hwif: port | ||
234 | * @drive: drive | 235 | * @drive: drive |
235 | * @speed: DMA mode | ||
236 | * | 236 | * |
237 | * Load the timing settings for this device mode into the | 237 | * Load the timing settings for this device mode into the |
238 | * controller. | 238 | * controller. |
239 | */ | 239 | */ |
240 | 240 | ||
241 | static void scc_set_dma_mode(ide_drive_t *drive, const u8 speed) | 241 | static void scc_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
242 | { | 242 | { |
243 | ide_hwif_t *hwif = drive->hwif; | ||
244 | struct scc_ports *ports = ide_get_hwifdata(hwif); | 243 | struct scc_ports *ports = ide_get_hwifdata(hwif); |
245 | unsigned long ctl_base = ports->ctl; | 244 | unsigned long ctl_base = ports->ctl; |
246 | unsigned long cckctrl_port = ctl_base + 0xff0; | 245 | unsigned long cckctrl_port = ctl_base + 0xff0; |
@@ -254,6 +253,7 @@ static void scc_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
254 | int offset, idx; | 253 | int offset, idx; |
255 | unsigned long reg; | 254 | unsigned long reg; |
256 | unsigned long jcactsel; | 255 | unsigned long jcactsel; |
256 | const u8 speed = drive->dma_mode; | ||
257 | 257 | ||
258 | reg = in_be32((void __iomem *)cckctrl_port); | 258 | reg = in_be32((void __iomem *)cckctrl_port); |
259 | if (reg & CCKCTRL_ATACLKOEN) { | 259 | if (reg & CCKCTRL_ATACLKOEN) { |