Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d9f9a76 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 5e59c236
Loading
Loading
Loading
Loading
+2 −9
Original line number Diff line number Diff line
@@ -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);