Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e932159 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

treewide: remove references to the now unnecessary DEFINE_PCI_DEVICE_TABLE 

It's been eliminated from the sources, remove it from everywhere else.

Link: http://lkml.kernel.org/r/076eff466fd7edb550c25c8b25d76924ca0eba62.1472660229.git.joe@perches.com


Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8a793bea

Documentation/PCI/pci.txt

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ 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.  Definitions with static const are generally preferred.

Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.



Each entry consists of:

include/linux/pci.h

+0 −9
Original line number Diff line number Diff line
@@ -682,15 +682,6 @@ struct pci_driver { 


#define	to_pci_driver(drv) container_of(drv, struct pci_driver, driver)



/**

 * DEFINE_PCI_DEVICE_TABLE - macro used to describe a pci device table

 * @_table: device table name

 *

 * This macro is deprecated and should not be used in new code.

 */

#define DEFINE_PCI_DEVICE_TABLE(_table) \

	const struct pci_device_id _table[]



/**

 * PCI_DEVICE - macro used to describe a specific pci device

 * @vend: the 16 bit PCI Vendor ID

scripts/checkpatch.pl

+0 −9
Original line number Diff line number Diff line
@@ -3570,15 +3570,6 @@ sub process { 
			}

		}



# 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[$fixlinenr] =~ 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

# make sense.

		if ($line =~ /\btypedef\s/ &&

scripts/tags.sh

+0 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ regex_c=( 
	'/\<DEFINE_PER_CPU_SHARED_ALIGNED([^,]*, *\([[:alnum:]_]*\)/\1/v/'

	'/\<DECLARE_WAIT_QUEUE_HEAD(\([[:alnum:]_]*\)/\1/v/'

	'/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/'

	'/\<DEFINE_PCI_DEVICE_TABLE(\([[:alnum:]_]*\)/\1/v/'

	'/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'

	'/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'

	'/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/'