Skip to contentSkip to conversation

xtensa: don't use module_init for non-modular core network.c code

PATCH Superseded Paul Gortmaker 1 participant 2 messages Jan 23, 2014 Tensilica Xtensa port (xtensa)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xtensa: don't use module_init for non-modular core network.c code

The network.c code is always built in. It will never be modular, so using module_init as an alias for __initcall is rather misleading.

Fix this up now, so that we can relocate module_init from init.h into module.h in the future. If we don't do this, we'd have to add module.h to obviously non-modular code, and that would be a worse thing.

Direct use of __initcall is discouraged, vs prioritized ones. Use of device_initcall is consistent with what __initcall maps onto, and hence does not change the init order, making the
impact of this change zero. Should someone with real hardware
for boot testing want to change it later to arch_initcall or something different, they can do that at a later date.

---

[patch will be added to init cleanup series:
http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/ ]

 arch/xtensa/platforms/iss/network.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
arch/xtensa/platforms/iss/network.c +1 -3
index d05f8feeb8d7..32b413b21483 100644
@@ -680,6 +680,4 @@ static int iss_net_init(void)
 
 	return 1;
 }
-
-module_init(iss_net_init);
-
+device_initcall(iss_net_init);
Signature · 1 line
1.8.5.2
#1 lore raw

PATCH v2 1/1 xtensa: don't use module_init for non-modular core network.c code

The network.c code is piggybacking off of the arch independent CONFIG_NET, which is bool. So the code is either built in or absent. It will never be modular, so using module_init as an alias for __initcall is rather misleading.

Fix this up now, so that we can relocate module_init from init.h into module.h in the future. If we don't do this, we'd have to add module.h to obviously non-modular code, and that would be a worse thing.

Direct use of __initcall is discouraged, vs prioritized ones. Use of device_initcall is consistent with what __initcall maps onto, and hence does not change the init order, making the
impact of this change zero. Should someone with real hardware
for boot testing want to change it later to arch_initcall or something different, they can do that at a later date.

---

[v2: fix 1st paragraph of commit log; code depends on CONFIG_NET
and not on obj-y ; otherwise patch is unchanged. ]

[patch will be added to init cleanup series:
http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/ ]

 arch/xtensa/platforms/iss/network.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
arch/xtensa/platforms/iss/network.c +1 -3
index d05f8feeb8d7..32b413b21483 100644
@@ -680,6 +680,4 @@ static int iss_net_init(void)
 
 	return 1;
 }
-
-module_init(iss_net_init);
-
+device_initcall(iss_net_init);
Signature · 1 line
1.8.5.2