diff options
Diffstat (limited to 'drivers/ide/arm/icside.c')
-rw-r--r-- | drivers/ide/arm/icside.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index bd1f5b670378..e4875cef78bb 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
@@ -309,14 +309,6 @@ static int icside_dma_on(ide_drive_t *drive) | |||
309 | return 0; | 309 | return 0; |
310 | } | 310 | } |
311 | 311 | ||
312 | static int icside_dma_check(ide_drive_t *drive) | ||
313 | { | ||
314 | if (ide_tune_dma(drive)) | ||
315 | return 0; | ||
316 | |||
317 | return -1; | ||
318 | } | ||
319 | |||
320 | static int icside_dma_end(ide_drive_t *drive) | 312 | static int icside_dma_end(ide_drive_t *drive) |
321 | { | 313 | { |
322 | ide_hwif_t *hwif = HWIF(drive); | 314 | ide_hwif_t *hwif = HWIF(drive); |
@@ -423,8 +415,6 @@ static void icside_dma_lost_irq(ide_drive_t *drive) | |||
423 | 415 | ||
424 | static void icside_dma_init(ide_hwif_t *hwif) | 416 | static void icside_dma_init(ide_hwif_t *hwif) |
425 | { | 417 | { |
426 | printk(" %s: SG-DMA", hwif->name); | ||
427 | |||
428 | hwif->atapi_dma = 1; | 418 | hwif->atapi_dma = 1; |
429 | hwif->mwdma_mask = 7; /* MW0..2 */ | 419 | hwif->mwdma_mask = 7; /* MW0..2 */ |
430 | hwif->swdma_mask = 7; /* SW0..2 */ | 420 | hwif->swdma_mask = 7; /* SW0..2 */ |
@@ -432,9 +422,7 @@ static void icside_dma_init(ide_hwif_t *hwif) | |||
432 | hwif->dmatable_cpu = NULL; | 422 | hwif->dmatable_cpu = NULL; |
433 | hwif->dmatable_dma = 0; | 423 | hwif->dmatable_dma = 0; |
434 | hwif->set_dma_mode = icside_set_dma_mode; | 424 | hwif->set_dma_mode = icside_set_dma_mode; |
435 | hwif->autodma = 1; | ||
436 | 425 | ||
437 | hwif->ide_dma_check = icside_dma_check; | ||
438 | hwif->dma_host_off = icside_dma_host_off; | 426 | hwif->dma_host_off = icside_dma_host_off; |
439 | hwif->dma_off_quietly = icside_dma_off_quietly; | 427 | hwif->dma_off_quietly = icside_dma_off_quietly; |
440 | hwif->dma_host_on = icside_dma_host_on; | 428 | hwif->dma_host_on = icside_dma_host_on; |
@@ -446,11 +434,6 @@ static void icside_dma_init(ide_hwif_t *hwif) | |||
446 | hwif->ide_dma_test_irq = icside_dma_test_irq; | 434 | hwif->ide_dma_test_irq = icside_dma_test_irq; |
447 | hwif->dma_timeout = icside_dma_timeout; | 435 | hwif->dma_timeout = icside_dma_timeout; |
448 | hwif->dma_lost_irq = icside_dma_lost_irq; | 436 | hwif->dma_lost_irq = icside_dma_lost_irq; |
449 | |||
450 | hwif->drives[0].autodma = hwif->autodma; | ||
451 | hwif->drives[1].autodma = hwif->autodma; | ||
452 | |||
453 | printk(" capable%s\n", hwif->autodma ? ", auto-enable" : ""); | ||
454 | } | 437 | } |
455 | #else | 438 | #else |
456 | #define icside_dma_init(hwif) (0) | 439 | #define icside_dma_init(hwif) (0) |