From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753319Ab3LMSjP (ORCPT ); Fri, 13 Dec 2013 13:39:15 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:54819 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753221Ab3LMSjL (ORCPT ); Fri, 13 Dec 2013 13:39:11 -0500 Date: Fri, 13 Dec 2013 11:39:05 -0700 From: Bjorn Helgaas To: Joe Perches Cc: Jonas Bonn , Jingoo Han , "'Guenter Roeck'" , "'Greg Kroah-Hartman'" , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, "'Andrew Morton'" , "'Andy Whitcroft'" , linux-serial@vger.kernel.org Subject: Re: [PATCH] pci/checkpatch: Deprecate DEFINE_PCI_DEVICE_TABLE Message-ID: <20131213183905.GA6746@google.com> References: <1385617213.12210.5.camel@joe-AO722> <20131128055328.GA565@kroah.com> <1385619863.12210.14.camel@joe-AO722> <529C026E.2000302@roeck-us.net> <000f01ceef11$a14acf00$e3e06d00$%han@samsung.com> <529C04C7.9050506@roeck-us.net> <001001ceef13$7fa3ee70$7eebcb50$%han@samsung.com> <1385963295.2680.2.camel@joe-AO722> <529C6495.3020305@southpole.se> <1386006217.2680.13.camel@joe-AO722> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1386006217.2680.13.camel@joe-AO722> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 02, 2013 at 09:43:37AM -0800, Joe Perches wrote: > Prefer use of the direct definition of struct pci_device_id > instead of indirection via macro DEFINE_PCI_DEVICE_TABLE. > > Update the PCI documentation to deprecate DEFINE_PCI_DEVICE_TABLE. > Update checkpatch adding --fix option. > > Signed-off-by: Joe Perches Applied with Jingoo's ack for v3.14, thanks! Bjorn > --- > Documentation/PCI/pci.txt | 6 ++++-- > include/linux/pci.h | 3 +-- > scripts/checkpatch.pl | 11 +++++++---- > 3 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt > index 6f45856..9518006 100644 > --- a/Documentation/PCI/pci.txt > +++ b/Documentation/PCI/pci.txt > @@ -123,8 +123,10 @@ initialization with a pointer to a structure describing the driver > > > The ID table is an array of struct pci_device_id entries ending with an > -all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred > -method of declaring the table. Each entry consists of: > +all-zero entry. Definitions with static const are generally preferred. > +Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided. > + > +Each entry consists of: > > vendor,device Vendor and device ID to match (or PCI_ANY_ID) > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 1084a15..88674b0 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -634,8 +634,7 @@ struct pci_driver { > * DEFINE_PCI_DEVICE_TABLE - macro used to describe a pci device table > * @_table: device table name > * > - * This macro is used to create a struct pci_device_id array (a device table) > - * in a generic manner. > + * This macro is deprecated and should not be used in new code. > */ > #define DEFINE_PCI_DEVICE_TABLE(_table) \ > const struct pci_device_id _table[] > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index 38be5d5..6f883f0 100755 > --- a/scripts/checkpatch.pl > +++ b/scripts/checkpatch.pl > @@ -2643,10 +2643,13 @@ sub process { > } > } > > -# check for declarations of struct pci_device_id > - if ($line =~ /\bstruct\s+pci_device_id\s+\w+\s*\[\s*\]\s*\=\s*\{/) { > - WARN("DEFINE_PCI_DEVICE_TABLE", > - "Use DEFINE_PCI_DEVICE_TABLE for struct pci_device_id\n" . $herecurr); > +# check for uses of DEFINE_PCI_DEVICE_TABLE > + if ($line =~ /\bDEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=/) { > + if (WARN("DEFINE_PCI_DEVICE_TABLE", > + "Prefer struct pci_device_id over deprecated DEFINE_PCI_DEVICE_TABLE\n" . $herecurr) && > + $fix) { > + $fixed[$linenr - 1] =~ s/\b(?:static\s+|)DEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=\s*/static const struct pci_device_id $1\[\] = /; > + } > } > > # check for new typedefs, only function parameters and sparse annotations > >