<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">ChangeSet 1.872.3.2, 2002/11/19 20:24:56-08:00, greg@kroah.com

PCMCIA: remove usage of pcibios_read_config_dword


diff -Nru a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
--- a/drivers/pcmcia/cistpl.c	Tue Nov 19 21:06:55 2002
+++ b/drivers/pcmcia/cistpl.c	Tue Nov 19 21:06:55 2002
@@ -430,7 +430,10 @@
 #ifdef CONFIG_CARDBUS
     if (s-&gt;state &amp; SOCKET_CARDBUS) {
 	u_int ptr;
-	pcibios_read_config_dword(s-&gt;cap.cb_dev-&gt;subordinate-&gt;number, 0, 0x28, &amp;ptr);
+	struct pci_dev *dev = pci_find_slot (s-&gt;cap.cb_dev-&gt;subordinate-&gt;number, 0);
+	if (!dev)
+	    return CS_BAD_HANDLE;
+	pci_read_config_dword(dev, 0x28, &amp;ptr);
 	tuple-&gt;CISOffset = ptr &amp; ~7;
 	SPACE(tuple-&gt;Flags) = (ptr &amp; 7);
     } else
</pre></body></html>