Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro is not preferred. Also, the definition of DEFINE_PCI_DEVICE_TABLE macro is removed.
Signed-off-by: Jingoo Han <[email protected]> --- Documentation/PCI/pci.txt | 3 +-- drivers/pci/ioapic.c | 2 +- include/linux/pci.h | 10 ---------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt index 6f45856..2f14be7 100644 --- a/Documentation/PCI/pci.txt +++ b/Documentation/PCI/pci.txt @@ -123,8 +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 DEFINE_PCI_DEVICE_TABLE is the preferred -method of declaring the table. Each entry consists of: +all-zero entry; Each entry consists of: vendor,device Vendor and device ID to match (or PCI_ANY_ID) diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c index 50ce680..d9d249a2 100644 --- a/drivers/pci/ioapic.c +++ b/drivers/pci/ioapic.c @@ -99,7 +99,7 @@ static void ioapic_remove(struct pci_dev *dev) } -static DEFINE_PCI_DEVICE_TABLE(ioapic_devices) = { +static const struct pci_device_id ioapic_devices[] = { { PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOAPIC, ~0) }, { PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOXAPIC, ~0) }, { } diff --git a/include/linux/pci.h b/include/linux/pci.h index 1084a15..6c1f6af 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -631,16 +631,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 used to create a struct pci_device_id array (a device table) - * in a generic manner. - */ -#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 * @dev: the 16 bit PCI Device ID -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
