Messages in this thread Patch in this message | | | Date | Thu, 13 Sep 2007 10:34:02 +0400 | From | "Alexey Dobriyan" <> | Subject | Re: [PATCH] pci: fix unterminated pci_device_id lists |
| |
[non-terminated PCI ids arrays]
Here is compile-time hack (yep, warped and whitespace damaged :)) It's better than modpost-time hack. because it triggers earlier. It's worse than modpost-time hack, because of tree-wide changes.
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index f4e4298..b895b5f 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -237,7 +237,7 @@ static const struct { };
-static struct pci_device_id rtl8139_pci_tbl[] = { +PCI_MODULE_DEVICE_TABLE_BEGIN(rtl8139_pci_tbl) {0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, {0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, {0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, @@ -273,10 +273,7 @@ static struct pci_device_id rtl8139_pci_tbl[] = { {PCI_ANY_ID, 0x8139, 0x10ec, 0x8139, 0, 0, RTL8139 }, {PCI_ANY_ID, 0x8139, 0x1186, 0x1300, 0, 0, RTL8139 }, {PCI_ANY_ID, 0x8139, 0x13d1, 0xab06, 0, 0, RTL8139 }, - - {0,} -}; -MODULE_DEVICE_TABLE (pci, rtl8139_pci_tbl); +PCI_MODULE_DEVICE_TABLE_END
static struct { const char str[ETH_GSTRING_LEN]; diff --git a/include/linux/module.h b/include/linux/module.h index b6a646c..aef3cd9 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -137,6 +137,13 @@ extern struct module __this_module; #define MODULE_DEVICE_TABLE(type,name) \ MODULE_GENERIC_TABLE(type##_device,name)
+#define PCI_MODULE_DEVICE_TABLE_BEGIN(name) \ + MODULE_DEVICE_TABLE(pci, name); \ + static struct pci_device_id name[] = { + +#define PCI_MODULE_DEVICE_TABLE_END \ + {}}; + /* Version of form [<epoch>:]<version>[-<extra-version>]. Or for CVS/RCS ID version, everything but the number is stripped. <epoch>: A (small) unsigned integer which allows you to start versions - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |