diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 22:25:20 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 22:25:20 +0200 |
| commit | 8d9f9a76ea09911f4aaf0d9e852fd25335080f53 (patch) | |
| tree | 00c8cda9398e6274607caaeb26cd06e1e44dffed | |
| parent | 5e59c236846df444860ffc8b852117f9ff65c101 (diff) | |
| download | linux-3.10-8d9f9a76ea09911f4aaf0d9e852fd25335080f53.tar.gz linux-3.10-8d9f9a76ea09911f4aaf0d9e852fd25335080f53.tar.bz2 linux-3.10-8d9f9a76ea09911f4aaf0d9e852fd25335080f53.zip | |
ide: don't display "BIOS" settings in ide_setup_dma()
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>
| -rw-r--r-- | drivers/ide/ide-dma.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index b38a9dfb314..1933254660a 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -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); |