From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751965AbbJDUw0 (ORCPT ); Sun, 4 Oct 2015 16:52:26 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:32960 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbbJDUwY (ORCPT ); Sun, 4 Oct 2015 16:52:24 -0400 From: Sergei Shtylyov To: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, stern@rowland.harvard.edu Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/8] ohci-pci:-use-PCI_VDEVICE() instead of PCI_DEVICE() Date: Sun, 04 Oct 2015 23:52:21 +0300 Message-ID: <1443996801.dccmB6yf7E@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.9 (Linux/4.1.7-100.fc21.x86_64; KDE/4.14.9; x86_64; ; ) In-Reply-To: <60171155.g7UZoV0Hgv@wasted.cogentembedded.com> References: <60171155.g7UZoV0Hgv@wasted.cogentembedded.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix using the PCI_DEVICE() macro instead of less verbose PCI_VDEVICE(). Signed-off-by: Sergei Shtylyov --- 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, },