aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/arm/icside.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:58 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:58 -0400
commit9ff6f72f432364991d68e99cae72cb141c166e70 (patch)
treee37e5dc6d1b2387f7cbc2909d5cb534d4a395a79 /drivers/ide/arm/icside.c
parent1b5169405e50b98b2bd1e4f86c7706ea24a59193 (diff)
ide: remove hwif->autodma and drive->autodma
* hpt34x.c: disable DMA masks for HPT345 (hwif->autodma is zero so DMA won't be enabled anyway). * trm290.c: disable IDE_HFLAG_TRUST_BIOS_FOR_DMA flag (hwif->autodma is zero so DMA won't be enabled anyway). * Check noautodma global variable instead of drive->autodma in ide_tune_dma(). This fixes handling of "ide=nodma" kernel parameter for icside, ide-cris, au1xxx-ide, pmac, it821x, jmicron, sgiioc4 and siimage host drivers. * Remove hwif->autodma (it was not checked by IDE core code anyway) and drive->autodma (was set by all host drivers - except HPT345/TRM290 special cases - unless "ide=nodma" was used). While at it: - remove needless printk() from icside.c - remove stale FIXME/comment from ide-probe.c - don't force DMA off if PCI bus-mastering had to be enabled in setup-pci.c (this setting was always later over-ridden by host drivers anyway) Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm/icside.c')
-rw-r--r--drivers/ide/arm/icside.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 0c6ce2faf8f5..e4875cef78bb 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -415,8 +415,6 @@ static void icside_dma_lost_irq(ide_drive_t *drive)
415 415
416static void icside_dma_init(ide_hwif_t *hwif) 416static void icside_dma_init(ide_hwif_t *hwif)
417{ 417{
418 printk(" %s: SG-DMA", hwif->name);
419
420 hwif->atapi_dma = 1; 418 hwif->atapi_dma = 1;
421 hwif->mwdma_mask = 7; /* MW0..2 */ 419 hwif->mwdma_mask = 7; /* MW0..2 */
422 hwif->swdma_mask = 7; /* SW0..2 */ 420 hwif->swdma_mask = 7; /* SW0..2 */
@@ -424,7 +422,6 @@ static void icside_dma_init(ide_hwif_t *hwif)
424 hwif->dmatable_cpu = NULL; 422 hwif->dmatable_cpu = NULL;
425 hwif->dmatable_dma = 0; 423 hwif->dmatable_dma = 0;
426 hwif->set_dma_mode = icside_set_dma_mode; 424 hwif->set_dma_mode = icside_set_dma_mode;
427 hwif->autodma = 1;
428 425
429 hwif->dma_host_off = icside_dma_host_off; 426 hwif->dma_host_off = icside_dma_host_off;
430 hwif->dma_off_quietly = icside_dma_off_quietly; 427 hwif->dma_off_quietly = icside_dma_off_quietly;
@@ -437,11 +434,6 @@ static void icside_dma_init(ide_hwif_t *hwif)
437 hwif->ide_dma_test_irq = icside_dma_test_irq; 434 hwif->ide_dma_test_irq = icside_dma_test_irq;
438 hwif->dma_timeout = icside_dma_timeout; 435 hwif->dma_timeout = icside_dma_timeout;
439 hwif->dma_lost_irq = icside_dma_lost_irq; 436 hwif->dma_lost_irq = icside_dma_lost_irq;
440
441 hwif->drives[0].autodma = hwif->autodma;
442 hwif->drives[1].autodma = hwif->autodma;
443
444 printk(" capable%s\n", hwif->autodma ? ", auto-enable" : "");
445} 437}
446#else 438#else
447#define icside_dma_init(hwif) (0) 439#define icside_dma_init(hwif) (0)