patch-2.4.22 linux-2.4.22/drivers/ide/setup-pci.c
Next file: linux-2.4.22/drivers/ieee1394/Config.in
Previous file: linux-2.4.22/drivers/ide/raid/hptraid.c
Back to the patch index
Back to the overall index
- Lines: 31
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/ide/setup-pci.c
- Orig date:
2003-06-13 07:51:34.000000000 -0700
diff -urN linux-2.4.21/drivers/ide/setup-pci.c linux-2.4.22/drivers/ide/setup-pci.c
@@ -137,7 +137,7 @@
"native PCI mode\n", name);
return -EOPNOTSUPP;
}
- printk("%s: placing both ports into native PCI mode\n", name);
+ printk(KERN_INFO "%s: placing both ports into native PCI mode\n", name);
(void) pci_write_config_byte(dev, PCI_CLASS_PROG, progif|5);
if (pci_read_config_byte(dev, PCI_CLASS_PROG, &progif) ||
(progif & 5) != 5) {
@@ -172,7 +172,7 @@
* is already in DMA mode we check and enforce IDE simplex rules.
*/
-static unsigned long __init ide_get_or_set_dma_base (ide_hwif_t *hwif)
+static unsigned long ide_get_or_set_dma_base (ide_hwif_t *hwif)
{
unsigned long dma_base = 0;
struct pci_dev *dev = hwif->pci_dev;
@@ -183,10 +183,9 @@
second_chance_to_dma:
#endif /* CONFIG_BLK_DEV_IDEDMA_FORCED */
- if ((hwif->mmio) && (hwif->dma_base))
+ if (hwif->mmio && hwif->dma_base)
return hwif->dma_base;
-
- if (hwif->mate && hwif->mate->dma_base) {
+ else if (hwif->mate && hwif->mate->dma_base) {
dma_base = hwif->mate->dma_base - (hwif->channel ? 0 : 8);
} else {
dma_base = (hwif->mmio) ?
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)