[libata] PCI ID table cleanup in various drivers

* Use PCI_VDEVICE() macro
* const-ify pci_device_id table
* standardize list terminator as "{ }"
* convert spaces to tab in pci_driver struct (Alan-ism)
* various minor whitespace cleanups

Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 14 insertions, 13 deletions

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index c01496df4a99..e6aa1a86d5cf 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -533,19 +533,20 @@ static const struct ata_port_info mv_port_info[] = {
 };
 
 static const struct pci_device_id mv_pci_tbl[] = {
-        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5040), 0, 0, chip_504x},
-        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5041), 0, 0, chip_504x},
-        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5080), 0, 0, chip_5080},
-        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5081), 0, 0, chip_508x},
-
-        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6040), 0, 0, chip_604x},
-        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6041), 0, 0, chip_604x},
-        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6042), 0, 0, chip_6042},
-        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6080), 0, 0, chip_608x},
-        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6081), 0, 0, chip_608x},
-
-        {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x0241), 0, 0, chip_604x},
-        {}                      /* terminate list */
+        { PCI_VDEVICE(MARVELL, 0x5040), chip_504x },
+        { PCI_VDEVICE(MARVELL, 0x5041), chip_504x },
+        { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 },
+        { PCI_VDEVICE(MARVELL, 0x5081), chip_508x },
+
+        { PCI_VDEVICE(MARVELL, 0x6040), chip_604x },
+        { PCI_VDEVICE(MARVELL, 0x6041), chip_604x },
+        { PCI_VDEVICE(MARVELL, 0x6042), chip_6042 },
+        { PCI_VDEVICE(MARVELL, 0x6080), chip_608x },
+        { PCI_VDEVICE(MARVELL, 0x6081), chip_608x },
+
+        { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x },
+
+        { }                     /* terminate list */
 };
 
 static struct pci_driver mv_pci_driver = {