Skip to contentSkip to conversation

ia6: don't use module_init in non-modular sim/simscsi.c code

PATCH In review Paul Gortmaker 1 participant 2 messages Jan 16, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ia6: don't use module_init in non-modular sim/simscsi.c code

The simscsi.o is built for HP_SIMSCSI -- which is bool, and hence this code is either present or absent. It will never be modular, so using module_init as an alias for __initcall can be somewhat 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.

Note that direct use of __initcall is discouraged, vs. one of the priority categorized subgroups. As __initcall gets mapped onto device_initcall, our use of device_initcall directly in this change means that the runtime impact is zero -- it will remain at level 6 in initcall ordering.

And since it can't be modular, we remove all the __exitcall stuff related to module_exit() -- it is dead code that won't ever be executed.

arch/ia64/hp/sim/simscsi.c +1 -10
index 3a428f19a001..085047f3a545 100644
@@ -368,13 +368,4 @@ simscsi_init(void)
 	scsi_host_put(host);
 	return error;
 }
-
-static void __exit
-simscsi_exit(void)
-{
-	scsi_remove_host(host);
-	scsi_host_put(host);
-}
-
-module_init(simscsi_init);
-module_exit(simscsi_exit);
+device_initcall(simscsi_init);
Signature · 1 line
1.8.5.2
#1 lore raw

[[PATCH] ia6: don't use module_init in non-modular sim/simscsi.c code] On 16/01/2014 (Thu 17:18) Paul Gortmaker wrote:

I've fixed the fat fingered subject that deleted "4" from the subject in my patch queue for this cleanup...

P.
--

Quoted 47 lines

The simscsi.o is built for HP_SIMSCSI -- which is bool, and hence this code is either present or absent. It will never be modular, so using module_init as an alias for __initcall can be somewhat 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.

Note that direct use of __initcall is discouraged, vs. one of the priority categorized subgroups. As __initcall gets mapped onto device_initcall, our use of device_initcall directly in this change means that the runtime impact is zero -- it will remain at level 6 in initcall ordering.

And since it can't be modular, we remove all the __exitcall stuff related to module_exit() -- it is dead code that won't ever be executed.

arch/ia64/hp/sim/simscsi.c +1 -10
index 3a428f19a001..085047f3a545 100644
@@ -368,13 +368,4 @@ simscsi_init(void)
 	scsi_host_put(host);
 	return error;
 }
-
-static void __exit
-simscsi_exit(void)
-{
-	scsi_remove_host(host);
-	scsi_host_put(host);
-}
-
-module_init(simscsi_init);
-module_exit(simscsi_exit);
+device_initcall(simscsi_init);
Signature · 1 line
1.8.5.2