diff options
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 2711b5a6962d..b5a7d2578ab8 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -75,7 +75,7 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq, | |||
75 | */ | 75 | */ |
76 | if (drive->state == DMA_PIO_RETRY && drive->retry_pio <= 3) { | 76 | if (drive->state == DMA_PIO_RETRY && drive->retry_pio <= 3) { |
77 | drive->state = 0; | 77 | drive->state = 0; |
78 | HWGROUP(drive)->hwif->ide_dma_on(drive); | 78 | ide_dma_on(drive); |
79 | } | 79 | } |
80 | 80 | ||
81 | if (!end_that_request_chunk(rq, uptodate, nr_bytes)) { | 81 | if (!end_that_request_chunk(rq, uptodate, nr_bytes)) { |
@@ -219,7 +219,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * | |||
219 | * we could be smarter and check for current xfer_speed | 219 | * we could be smarter and check for current xfer_speed |
220 | * in struct drive etc... | 220 | * in struct drive etc... |
221 | */ | 221 | */ |
222 | if (drive->hwif->ide_dma_on == NULL) | 222 | if (drive->hwif->dma_host_on == NULL) |
223 | break; | 223 | break; |
224 | /* | 224 | /* |
225 | * TODO: respect ->using_dma setting | 225 | * TODO: respect ->using_dma setting |
@@ -787,7 +787,7 @@ static ide_startstop_t do_special (ide_drive_t *drive) | |||
787 | 787 | ||
788 | if (hwif->host_flags & IDE_HFLAG_SET_PIO_MODE_KEEP_DMA) { | 788 | if (hwif->host_flags & IDE_HFLAG_SET_PIO_MODE_KEEP_DMA) { |
789 | if (keep_dma) | 789 | if (keep_dma) |
790 | hwif->ide_dma_on(drive); | 790 | ide_dma_on(drive); |
791 | } | 791 | } |
792 | } | 792 | } |
793 | 793 | ||
@@ -1334,7 +1334,7 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) | |||
1334 | */ | 1334 | */ |
1335 | drive->retry_pio++; | 1335 | drive->retry_pio++; |
1336 | drive->state = DMA_PIO_RETRY; | 1336 | drive->state = DMA_PIO_RETRY; |
1337 | hwif->dma_off_quietly(drive); | 1337 | ide_dma_off_quietly(drive); |
1338 | 1338 | ||
1339 | /* | 1339 | /* |
1340 | * un-busy drive etc (hwgroup->busy is cleared on return) and | 1340 | * un-busy drive etc (hwgroup->busy is cleared on return) and |