]> err.no Git - linux-2.6/commitdiff
ide: don't display "BIOS" settings in ide_setup_dma()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 26 Apr 2008 20:25:20 +0000 (22:25 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 26 Apr 2008 20:25:20 +0000 (22:25 +0200)
Nowadays BIOS info is not very useful and only confuses users since:

- IDE always tries to use DMA

- BIOS info may not be accurate with modular IDE/libata

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-dma.c

index b38a9dfb31468c9016fe3c04f29e79ab58821a82..1933254660a1df96da7332f467887471cc2d3b22 100644 (file)
@@ -840,12 +840,10 @@ static int ide_allocate_dma_engine(ide_hwif_t *hwif)
 
 void ide_setup_dma(ide_hwif_t *hwif, unsigned long base)
 {
-       u8 dma_stat;
-
        if (hwif->mmio)
-               printk(KERN_INFO "    %s: MMIO-DMA ", hwif->name);
+               printk(KERN_INFO "    %s: MMIO-DMA\n", hwif->name);
        else
-               printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx",
+               printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx\n",
                                 hwif->name, base, base + 7);
 
        hwif->extra_base = base + (hwif->channel ? 8 : 16);
@@ -884,11 +882,6 @@ void ide_setup_dma(ide_hwif_t *hwif, unsigned long base)
                hwif->dma_timeout = &ide_dma_timeout;
        if (!hwif->dma_lost_irq)
                hwif->dma_lost_irq = &ide_dma_lost_irq;
-
-       dma_stat = hwif->INB(hwif->dma_status);
-       printk(KERN_CONT ", BIOS settings: %s:%s, %s:%s\n",
-              hwif->drives[0].name, (dma_stat & 0x20) ? "DMA" : "PIO",
-              hwif->drives[1].name, (dma_stat & 0x40) ? "DMA" : "PIO");
 }
 
 EXPORT_SYMBOL_GPL(ide_setup_dma);