Subject: [PATCH] [MEGARAID] convert to PCI_DEVICE() macro

From: Henrik Kretzschmar <[email protected]>

Convert the pci_device_id-table of the megaraid_sas-driver to
the PCI_DEVICE-macro, to safe some lines.

Signed-off-by: Henrik Kretzschmar <[email protected]>

---

--- linux-2.6.18-rc4/drivers/scsi/megaraid/megaraid_sas.c 2006-08-11 10:09:21.000000000 +0200
+++ linux/drivers/scsi/megaraid/megaraid_sas.c 2006-08-11 13:29:29.000000000 +0200
@@ -53,31 +53,15 @@
*/
static struct pci_device_id megasas_pci_table[] = {

- {
- PCI_VENDOR_ID_LSI_LOGIC,
- PCI_DEVICE_ID_LSI_SAS1064R, /* xscale IOP */
- PCI_ANY_ID,
- PCI_ANY_ID,
- },
- {
- PCI_VENDOR_ID_LSI_LOGIC,
- PCI_DEVICE_ID_LSI_SAS1078R, /* ppc IOP */
- PCI_ANY_ID,
- PCI_ANY_ID,
- },
- {
- PCI_VENDOR_ID_LSI_LOGIC,
- PCI_DEVICE_ID_LSI_VERDE_ZCR, /* xscale IOP, vega */
- PCI_ANY_ID,
- PCI_ANY_ID,
- },
- {
- PCI_VENDOR_ID_DELL,
- PCI_DEVICE_ID_DELL_PERC5, /* xscale IOP */
- PCI_ANY_ID,
- PCI_ANY_ID,
- },
- {0} /* Terminating entry */
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)},
+ /* xscale IOP */
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},
+ /* ppc IOP */
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)},
+ /* xscale IOP, vega */
+ {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
+ /* xscale IOP */
+ {}
};

MODULE_DEVICE_TABLE(pci, megasas_pci_table);



2006-08-18 01:51:11

by Patro, Sumant

[permalink] [raw]
Subject: RE: [PATCH] [MEGARAID] convert to PCI_DEVICE() macro

ACK.
Thanks for submitting the patch.

Regards,
Sumant

-----Original Message-----
From: [email protected]
[mailto:[email protected]] On Behalf Of Henne
Sent: Tuesday, August 15, 2006 2:17 AM
To: Kolli, Neela
Cc: [email protected]; [email protected];
[email protected]
Subject: [PATCH] [MEGARAID] convert to PCI_DEVICE() macro

From: Henrik Kretzschmar <[email protected]>

Convert the pci_device_id-table of the megaraid_sas-driver to
the PCI_DEVICE-macro, to safe some lines.

Signed-off-by: Henrik Kretzschmar <[email protected]>

---

--- linux-2.6.18-rc4/drivers/scsi/megaraid/megaraid_sas.c
2006-08-11 10:09:21.000000000 +0200
+++ linux/drivers/scsi/megaraid/megaraid_sas.c 2006-08-11
13:29:29.000000000 +0200
@@ -53,31 +53,15 @@
*/
static struct pci_device_id megasas_pci_table[] = {

- {
- PCI_VENDOR_ID_LSI_LOGIC,
- PCI_DEVICE_ID_LSI_SAS1064R, /* xscale IOP */
- PCI_ANY_ID,
- PCI_ANY_ID,
- },
- {
- PCI_VENDOR_ID_LSI_LOGIC,
- PCI_DEVICE_ID_LSI_SAS1078R, /* ppc IOP */
- PCI_ANY_ID,
- PCI_ANY_ID,
- },
- {
- PCI_VENDOR_ID_LSI_LOGIC,
- PCI_DEVICE_ID_LSI_VERDE_ZCR, /* xscale IOP, vega */
- PCI_ANY_ID,
- PCI_ANY_ID,
- },
- {
- PCI_VENDOR_ID_DELL,
- PCI_DEVICE_ID_DELL_PERC5, /* xscale IOP */
- PCI_ANY_ID,
- PCI_ANY_ID,
- },
- {0} /* Terminating entry */
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC,
PCI_DEVICE_ID_LSI_SAS1064R)},
+ /* xscale IOP */
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC,
PCI_DEVICE_ID_LSI_SAS1078R)},
+ /* ppc IOP */
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC,
PCI_DEVICE_ID_LSI_VERDE_ZCR)},
+ /* xscale IOP, vega */
+ {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
+ /* xscale IOP */
+ {}
};

MODULE_DEVICE_TABLE(pci, megasas_pci_table);