diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:20 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:20 -0400 |
commit | 8d9f9a76ea09911f4aaf0d9e852fd25335080f53 (patch) | |
tree | 00c8cda9398e6274607caaeb26cd06e1e44dffed /drivers | |
parent | 5e59c236846df444860ffc8b852117f9ff65c101 (diff) |
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>
Diffstat (limited to 'drivers')
-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 b38a9dfb3146..1933254660a1 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) | |||
840 | 840 | ||
841 | void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) | 841 | void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) |
842 | { | 842 | { |
843 | u8 dma_stat; | ||
844 | |||
845 | if (hwif->mmio) | 843 | if (hwif->mmio) |
846 | printk(KERN_INFO " %s: MMIO-DMA ", hwif->name); | 844 | printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name); |
847 | else | 845 | else |
848 | printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx", | 846 | printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n", |
849 | hwif->name, base, base + 7); | 847 | hwif->name, base, base + 7); |
850 | 848 | ||
851 | hwif->extra_base = base + (hwif->channel ? 8 : 16); | 849 | hwif->extra_base = base + (hwif->channel ? 8 : 16); |
@@ -884,11 +882,6 @@ void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) | |||
884 | hwif->dma_timeout = &ide_dma_timeout; | 882 | hwif->dma_timeout = &ide_dma_timeout; |
885 | if (!hwif->dma_lost_irq) | 883 | if (!hwif->dma_lost_irq) |
886 | hwif->dma_lost_irq = &ide_dma_lost_irq; | 884 | hwif->dma_lost_irq = &ide_dma_lost_irq; |
887 | |||
888 | dma_stat = hwif->INB(hwif->dma_status); | ||
889 | printk(KERN_CONT ", BIOS settings: %s:%s, %s:%s\n", | ||
890 | hwif->drives[0].name, (dma_stat & 0x20) ? "DMA" : "PIO", | ||
891 | hwif->drives[1].name, (dma_stat & 0x40) ? "DMA" : "PIO"); | ||
892 | } | 885 | } |
893 | 886 | ||
894 | EXPORT_SYMBOL_GPL(ide_setup_dma); | 887 | EXPORT_SYMBOL_GPL(ide_setup_dma); |