patch-2.3.49 linux/drivers/scsi/pci2220i.c

• Lines: 19
• Date: Mon Feb 28 07:16:54 2000
• Orig file: v2.3.48/linux/drivers/scsi/pci2220i.c
• Orig date: Sat Feb 26 22:31:48 2000

diff -u --recursive --new-file v2.3.48/linux/drivers/scsi/pci2220i.c linux/drivers/scsi/pci2220i.c
@@ -2448,15 +2448,9 @@
 	memset (&DaleSetup, 0, sizeof (DaleSetup));
 	memset (DiskMirror, 0, sizeof (DiskMirror));
 
-#if LINUX_VERSION_CODE > LINUXVERSION(2,1,92)
-	zr = pcidev->base_address[1] & 0xFFFE;
-	zl = pcidev->base_address[2] & 0xFFFE;
-#else
-	pcibios_read_config_word (pci_bus, pci_device_fn, PCI_BASE_ADDRESS_1, &zr);
-	zr &= 0xFFFE;
-	pcibios_read_config_word (pci_bus, pci_device_fn, PCI_BASE_ADDRESS_2, &zl);
-	zl &= 0xFFFE;
-#endif
+	zr = pci_resource_start (pcidev, 1);
+	zl = pci_resource_start (pcidev, 2);
+
 	padapter->basePort = zr;
 	padapter->regRemap		= zr + RTR_LOCAL_REMAP;					// 32 bit local space remap
 	padapter->regDesc		= zr + RTR_REGIONS;	  					// 32 bit local region descriptor