lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename DECLARE_PCI_DEVICE_TABLE to DEFINE_PCI_DEVICE_TABLE

Browse Source 
This macro is used to define tables, not to declare them.

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton
2008-03-10 11:43:34 -07:00
committed by Linus Torvalds
parent f4299e1943
commit 9f9351bbe3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/pci.txt
View File

@@ -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 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: method of declaring the table. Each entry consists of:
vendor,device Vendor and device ID to match (or PCI_ANY_ID) 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 Do not mark the struct pci_driver.
o The ID table array should be marked __devinitconst; this is done 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 o The probe() and remove() functions should be marked __devinit
and __devexit respectively. All initialization functions and __devexit respectively. All initialization functions

4
include/linux/pci.h
View File

@@ -389,13 +389,13 @@ struct pci_driver {
#define to_pci_driver(drv) container_of(drv, struct pci_driver, 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 * @_table: device table name
* *
* This macro is used to create a struct pci_device_id array (a device table) * This macro is used to create a struct pci_device_id array (a device table)
* in a generic manner. * in a generic manner.
*/ */
#define DECLARE_PCI_DEVICE_TABLE(_table) \ #define DEFINE_PCI_DEVICE_TABLE(_table) \
const struct pci_device_id _table[] __devinitconst const struct pci_device_id _table[] __devinitconst
/** /**