From: Henrik Kretzschmar <[email protected]>
This changes the pci_module_init macro into a static inline function,
which is marked as deprecated.
For use on mm only.
At this time there are only 3 drivers with pci_module_init() in the mm tree
and this patch should help developers of new drivers to use
pci_register_driver() when their driver is tested in mm.
Signed-off-by: Henrik Kretzschmar <[email protected]>
---
--- linux-2.6.18-rc5-mm1/include/linux/pci.h 2006-09-04 15:33:23.000000000 +0200
+++ linux/include/linux/pci.h 2006-09-04 15:33:35.000000000 +0200
@@ -384,12 +384,6 @@
.vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \
.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
-/*
- * pci_module_init is obsolete, this stays here till we fix up all usages of it
- * in the tree.
- */
-#define pci_module_init pci_register_driver
-
/* these external functions are only available when PCI support is enabled */
#ifdef CONFIG_PCI
@@ -549,6 +543,16 @@
return __pci_register_driver(driver, THIS_MODULE);
}
+/*
+ * pci_module_init is obsolete, this stays here till we fix up all usages of it
+ * in the tree.
+ */
+
+static inline int __deprecated pci_module_init(struct pci_driver* drv)
+{
+ return pci_register_driver(drv);
+}
+
void pci_unregister_driver(struct pci_driver *);
void pci_remove_behind_bridge(struct pci_dev *);
struct pci_driver *pci_dev_driver(const struct pci_dev *);