[PATCH] [MM] 9/10 pci_module_init() convertion

From: Henne
Date: Mon Sep 04 2006 - 09:40:16 EST


From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>

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 <henne@xxxxxxxxxxxxxxxx>

---

--- 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 *);


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/