patch-2.3.99-pre7 linux/drivers/char/planb.c

• Lines: 36
• Date: Wed May 3 01:45:19 2000
• Orig file: v2.3.99-pre6/linux/drivers/char/planb.c
• Orig date: Wed Apr 26 16:34:07 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/char/planb.c linux/drivers/char/planb.c
@@ -2200,6 +2200,7 @@
 	unsigned char		dev_fn, confreg, bus;
 	unsigned int		old_base, new_base;
 	unsigned int		irq;
+	struct pci_dev 		*pdev;
 
 	if (_machine != _MACH_Pmac)
 		return 0;
@@ -2251,17 +2252,23 @@
 		"membase 0x%x (base reg. 0x%x)\n",
 		bus, PCI_SLOT(dev_fn), PCI_FUNC(dev_fn), old_base, confreg);
 
+	pdev = pci_find_slot (bus, dev_fn);
+	if (!pdev) {
+		printk(KERN_ERR "cannot find slot\n");
+		/* XXX handle error */
+	}
+
 	/* Enable response in memory space, bus mastering,
 	   use memory write and invalidate */
-	pcibios_write_config_word (bus, dev_fn, PCI_COMMAND,
+	pci_write_config_word (pdev, PCI_COMMAND,
 		PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
 		PCI_COMMAND_INVALIDATE);
 	/* Set PCI Cache line size & latency timer */
-	pcibios_write_config_byte (bus, dev_fn, PCI_CACHE_LINE_SIZE, 0x8);
-	pcibios_write_config_byte (bus, dev_fn, PCI_LATENCY_TIMER, 0x40);
+	pci_write_config_byte (pdev, PCI_CACHE_LINE_SIZE, 0x8);
+	pci_write_config_byte (pdev, PCI_LATENCY_TIMER, 0x40);
 
 	/* Set the new base address */
-	pcibios_write_config_dword (bus, dev_fn, confreg, new_base);
+	pci_write_config_dword (pdev, confreg, new_base);
 
 	planb_regs = (volatile struct planb_registers *)
 						ioremap (new_base, 0x400);