From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752040AbbJLRcA (ORCPT ); Mon, 12 Oct 2015 13:32:00 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:35319 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751585AbbJLRb6 (ORCPT ); Mon, 12 Oct 2015 13:31:58 -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] ohci-pci: use PCI_DEVICE_SUB() Date: Mon, 12 Oct 2015 20:31:55 +0300 Message-ID: <1541327.LNxLmfJ8uG@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.9 (Linux/4.1.8-100.fc21.x86_64; KDE/4.14.9; x86_64; ; ) 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 Toshiba Portege 4000 quirk entry can be written shorter using the PCI_DEVICE_SUB() macro. Signed-off-by: Sergei Shtylyov --- The patch is against the 'usb-next' branch of Greg KH's 'usb.git' repo. drivers/usb/host/ohci-pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Index: usb/drivers/usb/host/ohci-pci.c =================================================================== --- usb.orig/drivers/usb/host/ohci-pci.c +++ usb/drivers/usb/host/ohci-pci.c @@ -192,10 +192,8 @@ static const struct pci_device_id ohci_p }, { /* Toshiba portege 4000 */ - .vendor = PCI_VENDOR_ID_AL, - .device = 0x5237, - .subvendor = PCI_VENDOR_ID_TOSHIBA, - .subdevice = 0x0004, + PCI_DEVICE_SUB(PCI_VENDOR_ID_AL, 0x5237, + PCI_VENDOR_ID_TOSHIBA, 0x0004), .driver_data = (unsigned long) broken_suspend, }, {