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

Commit 8647af71 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

PCI: rename DECLARE_PCI_DEVICE_TABLE to DEFINE_PCI_DEVICE_TABLE 



a) DECLARE_PCI_DEVICE_TABLE is misnamed.  It is used to *define* tables,
   not to declare them.  It should be called DEFINE_PCI_DEVICE_TABLE.

b) It's lame, anyway.  We could implement any number of such helper
   thingies, but we choose not to.


So I wouldn't go adding code which uses this thing until it has a correct
name, and until we've decided that we actually want to live with it.


From: Andrew Morton <akpm@linux-foundation.org>
Cc: Jonas Bonn <jonas@southpole.se>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cdeeeae0

Documentation/pci.txt

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 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 DECLARE_PCI_DEVICE_TABLE is the preferred

all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred

method of declaring the table.  Each entry consists of:



	vendor,device	Vendor and device ID to match (or PCI_ANY_ID)
@@ -193,7 +193,7 @@ Tips on when/where to use the above attributes: 
	o Do not mark the struct pci_driver.



	o The ID table array should be marked __devinitconst; this is done

	  automatically if the table is declared with DECLARE_PCI_DEVICE_TABLE().

	  automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE().



	o The probe() and remove() functions should be marked __devinit

	  and __devexit respectively.  All initialization functions

include/linux/pci.h

+2 −2
Original line number Diff line number Diff line
@@ -389,13 +389,13 @@ struct pci_driver { 
#define	to_pci_driver(drv) container_of(drv, struct pci_driver, driver)



/**

 * DECLARE_PCI_DEVICE_TABLE - macro used to describe a pci device table

 * 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.

 */

#define DECLARE_PCI_DEVICE_TABLE(_table) \

#define DEFINE_PCI_DEVICE_TABLE(_table) \

	const struct pci_device_id _table[] __devinitconst



/**