Skip to contentSkip to conversation

Change pci_module_init from macro to inline function marked as deprecated

PATCH In review Henne 3 participants 4 messages Aug 15, 2006

Subsystems (2)
lore
Share & tools
lore

Henne

author
#0 lore raw

PATCH 1/1 Change pci_module_init from macro to inline function marked as deprecated

From: Henrik Kretzschmar <[email protected]>

Replaces the pci_module_init()-macro with a inline function,
which is marked as deprecated.
This gives a warning at compile time, which may be useful for driver developers who still use pci_module_init() on 2.6 drivers.

---

include/linux/pci.h +10 -6
@@ -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 *);

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw
Quoted 6 lines · Henne

From: Henrik Kretzschmar <[email protected]>

Replaces the pci_module_init()-macro with a inline function,
which is marked as deprecated.
This gives a warning at compile time, which may be useful for driver developers who still use pci_module_init() on 2.6 drivers.

Hi,

good work, but please stick this also in feature-removal.txt with a hard date on it, otherwise we can never get rid of it.....

Greetings,
Arjan van de Ven

Signature · 6 lines
if you want to mail me at work (you don't), use arjan (at) linux.intel.com

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
author
#2 lore raw
Quoted 8 lines · Arjan van de Ven
Quoted 6 lines · Henne

From: Henrik Kretzschmar <[email protected]>

Replaces the pci_module_init()-macro with a inline function,
which is marked as deprecated.
This gives a warning at compile time, which may be useful for driver developers who still use pci_module_init() on 2.6 drivers.

Quoted 8 lines

Hi,

good work, but please stick this also in feature-removal.txt with a hard date on it, otherwise we can never get rid of it.....

Greetings,
Arjan van de Ven

Hi,

it's already in that file since Feb06 ;).
The removal date is Jan07.

Greets,
Henne
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#3 lore raw
In reply to Henne
Quoted 6 lines · Henne

From: Henrik Kretzschmar <[email protected]>

Replaces the pci_module_init()-macro with a inline function,
which is marked as deprecated.
This gives a warning at compile time, which may be useful for driver developers who still use pci_module_init() on 2.6 drivers.

Have you gotten the network driver authors to buy into this? Last I heard, they did not want to change over for a few reasons.

If not, I'm not going to apply this, as it will just cause a zillion warnings that will not get fixed up.

thanks,

greg k-h
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors