[PATCH 2/8] ohci-pci:-use-PCI_VDEVICE() instead of PCI_DEVICE()

[Sergei Shtylyov]

Fix using the PCI_DEVICE() macro instead of less verbose PCI_VDEVICE().

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>

---
 drivers/usb/host/ohci-pci.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Index: usb/drivers/usb/host/ohci-pci.c
===================================================================
--- usb.orig/drivers/usb/host/ohci-pci.c
+++ usb/drivers/usb/host/ohci-pci.c
@@ -167,27 +167,27 @@ static int ohci_quirk_amd700(struct usb_
 /* List of quirks for OHCI */
 static const struct pci_device_id ohci_pci_quirks[] = {
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x740c),
+		PCI_VDEVICE(AMD, 0x740c),
 		.driver_data = (unsigned long)ohci_quirk_amd756,
 	},
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_OPTI, 0xc861),
+		PCI_VDEVICE(OPTI, 0xc861),
 		.driver_data = (unsigned long)ohci_quirk_opti,
 	},
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_ANY_ID),
+		PCI_VDEVICE(NS, PCI_ANY_ID),
 		.driver_data = (unsigned long)ohci_quirk_ns,
 	},
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xa0f8),
+		PCI_VDEVICE(COMPAQ, 0xa0f8),
 		.driver_data = (unsigned long)ohci_quirk_zfmicro,
 	},
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, 0x01b6),
+		PCI_VDEVICE(TOSHIBA_2, 0x01b6),
 		.driver_data = (unsigned long)ohci_quirk_toshiba_scc,
 	},
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB),
+		PCI_VDEVICE(NEC, PCI_DEVICE_ID_NEC_USB),
 		.driver_data = (unsigned long)ohci_quirk_nec,
 	},
 	{
@@ -199,19 +199,19 @@ static const struct pci_device_id ohci_p
 		.driver_data	= (unsigned long) broken_suspend,
 	},
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_ITE, 0x8152),
+		PCI_VDEVICE(ITE, 0x8152),
 		.driver_data = (unsigned long) broken_suspend,
 	},
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_ATI, 0x4397),
+		PCI_VDEVICE(ATI, 0x4397),
 		.driver_data = (unsigned long)ohci_quirk_amd700,
 	},
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_ATI, 0x4398),
+		PCI_VDEVICE(ATI, 0x4398),
 		.driver_data = (unsigned long)ohci_quirk_amd700,
 	},
 	{
-		PCI_DEVICE(PCI_VENDOR_ID_ATI, 0x4399),
+		PCI_VDEVICE(ATI, 0x4399),
 		.driver_data = (unsigned long)ohci_quirk_amd700,
 	},
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/