PCI: Add DECLARE_PCI_DEVICE_TABLE macro (90a1ba0c) · Commits · 戴 / test

The definitions of struct pci_device_id arrays should generally follow the same pattern across the entire kernel. This macro defines this array as const and puts it into the __devinitconst section. There are currently many definitions scattered about the kernel that omit the __devinitdata modifier despite the documentation stating that it should always be there. These definitions really also should have been const, which wasn't possible before but has become so with the addition of the __devinitconst attribute. Furthermore, there are definitions that use "const" and __devinitdata, which is explicitly wrong but the compiler doesn't catch section mismatches if there's only one such one case in the module (which is often the case). Adding the __devinitconst modifier where there was nothing before buys us memory. Adding the const modifier gives the compiler a chance to do its thing. Changing __devinitdata to __devinitconst where it was wrong actually fixes some compiler errors in older (mid-release) kernels that were patched over by "removing" the section attribute altogether (which wastes memory). This macro makes it pretty difficult to get this definition wrong in the future... Signed-off-by:

Jonas Bonn <jonas@southpole.se> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

Documentation/pci.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -123,7 +123,8 @@ 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. Each entry consists of:
		all-zero entry; use of the macro DECLARE_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)

		@@ -191,7 +192,8 @@ 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 __devinitdata.
		o The ID table array should be marked __devinitconst; this is done
		automatically if the table is declared with DECLARE_PCI_DEVICE_TABLE().

		o The probe() and remove() functions should be marked __devinit
		and __devexit respectively. All initialization functions

include/linux/pci.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -388,6 +388,16 @@ 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
		* @_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) \
		const struct pci_device_id _table[] __devinitconst

		/**
		* PCI_DEVICE - macro used to describe a specific pci device
		* @vend: the 16 bit PCI Vendor ID

Admin message