[PATCH 14/16] deps: WIP: kirkwood: annotate some initcalls
From: Alexander Holler <hidden>
Date: 2015-08-26 12:31:47
Also in:
linux-devicetree, lkml
Subsystem:
dma generic offload engine subsystem, marvell mv643xx ethernet driver, networking drivers, the rest, usb ehci driver, usb subsystem · Maintainers:
Vinod Koul, Sebastian Hesselbarth, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Alan Stern, Greg Kroah-Hartman
WIP means Work In Progress. Change some kirkwood drivers to offer annotated initcalls. Signed-off-by: Alexander Holler <redacted> --- drivers/dma/mv_xor.c | 2 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 3 ++- drivers/usb/host/ehci-orion.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index f1325f6..e766ab2 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c@@ -1295,7 +1295,7 @@ static int __init mv_xor_init(void) { return platform_driver_register(&mv_xor_driver); } -module_init(mv_xor_init); +annotated_module_init(mv_xor_init, mv_xor_driver.driver); /* it's currently unsafe to unload this module */ #if 0
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index d52639b..5eec4d8 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c@@ -3239,7 +3239,8 @@ static int __init mv643xx_eth_init_module(void) return rc; } -module_init(mv643xx_eth_init_module); +annotated_module_init(mv643xx_eth_init_module, + mv643xx_eth_shared_driver.driver); static void __exit mv643xx_eth_cleanup_module(void) {
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index bfcbb9a..28f8793 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c@@ -333,7 +333,7 @@ static int __init ehci_orion_init(void) ehci_init_driver(&ehci_orion_hc_driver, &orion_overrides); return platform_driver_register(&ehci_orion_driver); } -module_init(ehci_orion_init); +annotated_module_init(ehci_orion_init, ehci_orion_driver.driver); static void __exit ehci_orion_cleanup(void) {
--
2.1.0