diff options
Diffstat (limited to 'drivers/ide/arm/icside.c')
-rw-r--r-- | drivers/ide/arm/icside.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index 110e52377c71..bd1f5b670378 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
@@ -248,7 +248,7 @@ static void icside_build_sglist(ide_drive_t *drive, struct request *rq) | |||
248 | * MW1 80 50 50 150 C | 248 | * MW1 80 50 50 150 C |
249 | * MW2 70 25 25 120 C | 249 | * MW2 70 25 25 120 C |
250 | */ | 250 | */ |
251 | static int icside_set_speed(ide_drive_t *drive, const u8 xfer_mode) | 251 | static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode) |
252 | { | 252 | { |
253 | int cycle_time, use_dma_info = 0; | 253 | int cycle_time, use_dma_info = 0; |
254 | 254 | ||
@@ -273,7 +273,7 @@ static int icside_set_speed(ide_drive_t *drive, const u8 xfer_mode) | |||
273 | cycle_time = 480; | 273 | cycle_time = 480; |
274 | break; | 274 | break; |
275 | default: | 275 | default: |
276 | return 1; | 276 | return; |
277 | } | 277 | } |
278 | 278 | ||
279 | /* | 279 | /* |
@@ -287,8 +287,6 @@ static int icside_set_speed(ide_drive_t *drive, const u8 xfer_mode) | |||
287 | 287 | ||
288 | printk("%s: %s selected (peak %dMB/s)\n", drive->name, | 288 | printk("%s: %s selected (peak %dMB/s)\n", drive->name, |
289 | ide_xfer_verbose(xfer_mode), 2000 / drive->drive_data); | 289 | ide_xfer_verbose(xfer_mode), 2000 / drive->drive_data); |
290 | |||
291 | return ide_config_drive_speed(drive, xfer_mode); | ||
292 | } | 290 | } |
293 | 291 | ||
294 | static void icside_dma_host_off(ide_drive_t *drive) | 292 | static void icside_dma_host_off(ide_drive_t *drive) |
@@ -433,7 +431,7 @@ static void icside_dma_init(ide_hwif_t *hwif) | |||
433 | 431 | ||
434 | hwif->dmatable_cpu = NULL; | 432 | hwif->dmatable_cpu = NULL; |
435 | hwif->dmatable_dma = 0; | 433 | hwif->dmatable_dma = 0; |
436 | hwif->speedproc = icside_set_speed; | 434 | hwif->set_dma_mode = icside_set_dma_mode; |
437 | hwif->autodma = 1; | 435 | hwif->autodma = 1; |
438 | 436 | ||
439 | hwif->ide_dma_check = icside_dma_check; | 437 | hwif->ide_dma_check = icside_dma_check; |