Skip to contentSkip to conversation

Replace module_init with device_initcall in non modules

GIT PULL Paul Gortmaker 1 participant 1 message Jun 30, 2015

lore
Share & tools
lore
#0 lore raw

This series of commits converts non-modular code that is using the module_init() call to hook itself into the system to instead use device_initcall().

The conversion is a runtime no-op, since module_init actually becomes __initcall in the non-modular case, and that in turn gets mapped onto device_initcall. A couple files show a larger negative diffstat, representing ones that had a module_exit function that we remove here vs. previously relying on the linker to dispose of it.

We make this conversion now, so that we can relocate module_init from init.h into module.h in the future.

The files changed here are just limited to those that would otherwise have to add module.h to obviously non-modular code, in order to avoid a compile fail, as testing has shown.

Original posting:
"Replace module_init with device_initcall in non modules"
https://lkml.kernel.org/r/[email protected]

Thanks,
Paul.
---

The following changes since commit 0f57d86787d8b1076ea8f9cbdddda2a46d534a27:

Linux 4.1-rc8 (2015-06-14 15:51:10 -1000)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git tags/module_init-device_initcall-v4.1-rc8

for you to fetch changes up to b0c6d93014c8f2f53b70e9362b9fbec13b8e3aa0:

MIPS: don't use module_init in non-modular cobalt/mtd.c file (2015-06-16 14:34:36 -0400)

----------------------------------------------------------------
Replace module_init with equivalent device_initcall in non modules.

----------------------------------------------------------------
James Hogan (1):
tty/metag_da: Avoid module_init/module_exit in non-modular code

Paul Gortmaker (17):
x86: don't use module_init in non-modular intel_mid_vrtc.c
x86: don't use module_init in non-modular devicetree.c code
powerpc: use device_initcall for registering rtc devices
powerpc: don't use module_init in non-modular 83xx suspend code
arm: don't use module_init in non-modular mach-vexpress/spc.c code
ia64: don't use module_init for non-modular core kernel/mca.c code
ia64: don't use module_init in non-modular sim/simscsi.c code
cris: don't use module_init for non-modular core intmem.c code
parisc: don't use module_init for non-modular core pdc_cons code
parisc64: don't use module_init for non-modular core perf code
mn10300: don't use module_init in non-modular flash.c code
sh: don't use module_init in non-modular psw.c code
xtensa: don't use module_init for non-modular core network.c code drivers/clk: don't use module_init in clk-nomadik.c which is non-modular
cris: don't use module_init for non-modular core eeprom.c code drivers/leds: don't use module_init in non-modular leds-cobalt-raq.c
MIPS: don't use module_init in non-modular cobalt/mtd.c file

 arch/arm/mach-vexpress/spc.c                 |  2 +-
 arch/cris/arch-v10/drivers/eeprom.c          |  3 +--
 arch/cris/arch-v32/mm/intmem.c               |  3 +--
 arch/ia64/hp/sim/simscsi.c                   | 11 +----------
 arch/ia64/sn/kernel/mca.c                    |  3 +--
 arch/mips/cobalt/mtd.c                       |  3 +--
 arch/mn10300/unit-asb2303/flash.c            |  3 +--
 arch/parisc/kernel/pdc_cons.c                |  3 +--
 arch/parisc/kernel/perf.c                    |  3 +--
 arch/powerpc/kernel/time.c                   |  2 +-
 arch/powerpc/platforms/83xx/suspend.c        |  3 +--
 arch/powerpc/platforms/ps3/time.c            |  3 +--
 arch/sh/boards/mach-landisk/psw.c            |  2 +-
 arch/x86/kernel/devicetree.c                 |  2 +-
 arch/x86/platform/intel-mid/intel_mid_vrtc.c |  3 +--
 arch/xtensa/platforms/iss/network.c          |  4 +---
 drivers/clk/clk-nomadik.c                    |  3 +--
 drivers/leds/leds-cobalt-raq.c               | 15 +--------------
 drivers/tty/metag_da.c                       | 20 +-------------------
 19 files changed, 19 insertions(+), 72 deletions(-)