diff options
author | Ben Collins <bcollins@ubuntu.com> | 2006-10-18 08:40:57 -0400 |
---|---|---|
committer | Ben Collins <bcollins@ubuntu.com> | 2006-10-18 08:40:57 -0400 |
commit | 012887327875915f76a6208e81fe0d67a682ec15 (patch) | |
tree | 35ab4eb7ba3e1c4ca4714550a36d04a7b2a7196a | |
parent | 3985b977441f857404bb604a4b15911bbb0b9c5b (diff) |
[initio] Add pci dev table for module auto loading.
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
-rw-r--r-- | drivers/scsi/initio.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c index 911f2ff4a1f2..afed293dd7b9 100644 --- a/drivers/scsi/initio.c +++ b/drivers/scsi/initio.c | |||
@@ -142,8 +142,6 @@ | |||
142 | #define i91u_MAXQUEUE 2 | 142 | #define i91u_MAXQUEUE 2 |
143 | #define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.04a" | 143 | #define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.04a" |
144 | 144 | ||
145 | #define INI_VENDOR_ID 0x1101 /* Initio's PCI vendor ID */ | ||
146 | #define DMX_VENDOR_ID 0x134a /* Domex's PCI vendor ID */ | ||
147 | #define I950_DEVICE_ID 0x9500 /* Initio's inic-950 product ID */ | 145 | #define I950_DEVICE_ID 0x9500 /* Initio's inic-950 product ID */ |
148 | #define I940_DEVICE_ID 0x9400 /* Initio's inic-940 product ID */ | 146 | #define I940_DEVICE_ID 0x9400 /* Initio's inic-940 product ID */ |
149 | #define I935_DEVICE_ID 0x9401 /* Initio's inic-935 product ID */ | 147 | #define I935_DEVICE_ID 0x9401 /* Initio's inic-935 product ID */ |
@@ -171,13 +169,16 @@ static int setup_debug = 0; | |||
171 | 169 | ||
172 | static void i91uSCBPost(BYTE * pHcb, BYTE * pScb); | 170 | static void i91uSCBPost(BYTE * pHcb, BYTE * pScb); |
173 | 171 | ||
174 | static const PCI_ID i91u_pci_devices[] = { | 172 | /* PCI Devices supported by this driver */ |
175 | { INI_VENDOR_ID, I950_DEVICE_ID }, | 173 | static struct pci_device_id i91u_pci_devices[] __devinitdata = { |
176 | { INI_VENDOR_ID, I940_DEVICE_ID }, | 174 | { PCI_VENDOR_ID_INIT, I950_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
177 | { INI_VENDOR_ID, I935_DEVICE_ID }, | 175 | { PCI_VENDOR_ID_INIT, I940_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
178 | { INI_VENDOR_ID, I920_DEVICE_ID }, | 176 | { PCI_VENDOR_ID_INIT, I935_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
179 | { DMX_VENDOR_ID, I920_DEVICE_ID }, | 177 | { PCI_VENDOR_ID_INIT, I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
178 | { PCI_VENDOR_ID_DOMEX, I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
179 | { } | ||
180 | }; | 180 | }; |
181 | MODULE_DEVICE_TABLE(pci, i91u_pci_devices); | ||
181 | 182 | ||
182 | #define DEBUG_INTERRUPT 0 | 183 | #define DEBUG_INTERRUPT 0 |
183 | #define DEBUG_QUEUE 0 | 184 | #define DEBUG_QUEUE 0 |
@@ -2771,7 +2772,7 @@ static int tul_NewReturnNumberOfAdapters(void) | |||
2771 | 2772 | ||
2772 | for (i = 0; i < ARRAY_SIZE(i91u_pci_devices); i++) | 2773 | for (i = 0; i < ARRAY_SIZE(i91u_pci_devices); i++) |
2773 | { | 2774 | { |
2774 | while ((pDev = pci_find_device(i91u_pci_devices[i].vendor_id, i91u_pci_devices[i].device_id, pDev)) != NULL) { | 2775 | while ((pDev = pci_find_device(i91u_pci_devices[i].vendor, i91u_pci_devices[i].device, pDev)) != NULL) { |
2775 | if (pci_enable_device(pDev)) | 2776 | if (pci_enable_device(pDev)) |
2776 | continue; | 2777 | continue; |
2777 | pci_read_config_dword(pDev, 0x44, (u32 *) & dRegValue); | 2778 | pci_read_config_dword(pDev, 0x44, (u32 *) & dRegValue); |