diff options
| author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2006-05-17 18:09:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-05-20 10:49:37 -0400 |
| commit | 47f5e069e4d03dda36e3a13f3e20147efd710340 (patch) | |
| tree | a9816facb46a919754751edb675c73089e2ff2b5 | |
| parent | 441d1072040823feb4950a21094860bfddd310c0 (diff) | |
[SCSI] qla2xxx: Use PCI_DEVICE() for pci_device_id definition.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index ea8239dcbbbf..2f83523e78f2 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -2603,28 +2603,17 @@ qla2x00_release_firmware(void) | |||
| 2603 | } | 2603 | } |
| 2604 | 2604 | ||
| 2605 | static struct pci_device_id qla2xxx_pci_tbl[] = { | 2605 | static struct pci_device_id qla2xxx_pci_tbl[] = { |
| 2606 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100, | 2606 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, |
| 2607 | PCI_ANY_ID, PCI_ANY_ID, }, | 2607 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, |
| 2608 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200, | 2608 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, |
| 2609 | PCI_ANY_ID, PCI_ANY_ID, }, | 2609 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2312) }, |
| 2610 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300, | 2610 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2322) }, |
| 2611 | PCI_ANY_ID, PCI_ANY_ID, }, | 2611 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6312) }, |
| 2612 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2312, | 2612 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6322) }, |
| 2613 | PCI_ANY_ID, PCI_ANY_ID, }, | 2613 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2422) }, |
| 2614 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2322, | 2614 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2432) }, |
| 2615 | PCI_ANY_ID, PCI_ANY_ID, }, | 2615 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, |
| 2616 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6312, | 2616 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, |
| 2617 | PCI_ANY_ID, PCI_ANY_ID, }, | ||
| 2618 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6322, | ||
| 2619 | PCI_ANY_ID, PCI_ANY_ID, }, | ||
| 2620 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2422, | ||
| 2621 | PCI_ANY_ID, PCI_ANY_ID, }, | ||
| 2622 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2432, | ||
| 2623 | PCI_ANY_ID, PCI_ANY_ID, }, | ||
| 2624 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422, | ||
| 2625 | PCI_ANY_ID, PCI_ANY_ID, }, | ||
| 2626 | { PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432, | ||
| 2627 | PCI_ANY_ID, PCI_ANY_ID, }, | ||
| 2628 | { 0 }, | 2617 | { 0 }, |
| 2629 | }; | 2618 | }; |
| 2630 | MODULE_DEVICE_TABLE(pci, qla2xxx_pci_tbl); | 2619 | MODULE_DEVICE_TABLE(pci, qla2xxx_pci_tbl); |