Changes the pci_module_init macro into a deprecated inline function.
Signed-off-by: Henrik Kretzschmar <[email protected]>
---
Since nearly all pci_module_init()'s are removed from the tree (19 left), heres the patch for
2.6.18-git4.
In the mm-patchset it's called:
mark-pci_module_init-deprecated.patch
and can be removed if acked by greg.
--- linux-2.6/include/linux/pci.h 2006-08-01 01:31:59.000000000 +0200
+++ linux-2.6.18-git4/include/linux/pci.h 2006-09-25 21:01:47.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
@@ -547,6 +541,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 *);