Commit 2d440707 authored Jul 02, 2015 by Linus Torvalds

Merge tag 'module_init-device_initcall-v4.1-rc8' of...

Merge tag 'module_init-device_initcall-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

Pull module_init replacement part one from Paul Gortmaker:
 "Replace module_init with equivalent device_initcall in non modules.

  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"

* tag 'module_init-device_initcall-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  MIPS: don't use module_init in non-modular cobalt/mtd.c file
  drivers/leds: don't use module_init in non-modular leds-cobalt-raq.c
  cris: don't use module_init for non-modular core eeprom.c code
  tty/metag_da: Avoid module_init/module_exit in non-modular code
  drivers/clk: don't use module_init in clk-nomadik.c which is non-modular
  xtensa: don't use module_init for non-modular core network.c code
  sh: don't use module_init in non-modular psw.c code
  mn10300: don't use module_init in non-modular flash.c code
  parisc64: don't use module_init for non-modular core perf code
  parisc: don't use module_init for non-modular core pdc_cons code
  cris: don't use module_init for non-modular core intmem.c code
  ia64: don't use module_init in non-modular sim/simscsi.c code
  ia64: don't use module_init for non-modular core kernel/mca.c code
  arm: don't use module_init in non-modular mach-vexpress/spc.c code
  powerpc: don't use module_init in non-modular 83xx suspend code
  powerpc: use device_initcall for registering rtc devices
  x86: don't use module_init in non-modular devicetree.c code
  x86: don't use module_init in non-modular intel_mid_vrtc.c

parents 9d86b412 b0c6d930

arch/arm/mach-vexpress/spc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -589,4 +589,4 @@ static int __init ve_spc_clk_init(void)
		platform_device_register_simple("vexpress-spc-cpufreq", -1, NULL, 0);
		return 0;
		}
		module_init(ve_spc_clk_init);
		device_initcall(ve_spc_clk_init);

arch/cris/arch-v10/drivers/eeprom.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -848,5 +848,4 @@ static void eeprom_disable_write_protect(void)
		/* Write protect disabled */
		}
		}

		module_init(eeprom_init);
		device_initcall(eeprom_init);

arch/cris/arch-v32/mm/intmem.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -145,6 +145,5 @@ unsigned long crisv32_intmem_virt_to_phys(void* addr)
		(unsigned long)intmem_virtual + MEM_INTMEM_START +
		RESERVED_SIZE);
		}

		module_init(crisv32_intmem_init);
		device_initcall(crisv32_intmem_init);

arch/ia64/hp/sim/simscsi.c

+1 −10

Original line number	Diff line number	Diff line
		@@ -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);

arch/ia64/sn/kernel/mca.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -142,5 +142,4 @@ static int __init sn_salinfo_init(void)
		salinfo_platform_oemdata = &sn_salinfo_platform_oemdata;
		return 0;
		}

		module_init(sn_salinfo_init)
		device_initcall(sn_salinfo_init);