瀏覽代碼

MIPS: Audit and remove any unnecessary uses of module.h

Historically a lot of these existed because we did not have
a distinction between what was modular code and what was providing
support to modules via EXPORT_SYMBOL and friends.  That changed
when we forked out support for the latter into the export.h file.

This means we should be able to reduce the usage of module.h
in code that is obj-y Makefile or bool Kconfig.  In the case of
some code where it is modular, we can extend that to also include
files that are building basic support functionality but not related
to loading or registering the final module; such files also have
no need whatsoever for module.h

The advantage in removing such instances is that module.h itself
sources about 15 other headers; adding significantly to what we feed
cpp, and it can obscure what headers we are effectively using.

Since module.h might have been the implicit source for init.h
(for __init) and for export.h (for EXPORT_SYMBOL) we consider each
instance for the presence of either and replace/add as needed.

Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.

Build coverage of all the mips defconfigs revealed the module.h
header was masking a couple of implicit include instances, so
we add the appropriate headers there.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: David Daney <david.daney@cavium.com>
Cc: John Crispin <john@phrozen.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "Steven J. Hill" <steven.hill@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/15131/
[james.hogan@imgtec.com: Preserve sort order where it already exists]
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Paul Gortmaker 8 年之前
父節點
當前提交
26dd3e4ff9
共有 73 個文件被更改,包括 69 次插入78 次删除
  1. 1 1
      arch/mips/alchemy/common/dbdma.c
  2. 1 1
      arch/mips/alchemy/common/dma.c
  3. 0 1
      arch/mips/alchemy/common/gpiolib.c
  4. 0 1
      arch/mips/alchemy/common/prom.c
  5. 1 1
      arch/mips/alchemy/common/usb.c
  6. 1 1
      arch/mips/alchemy/common/vss.c
  7. 2 1
      arch/mips/alchemy/devboards/bcsr.c
  8. 1 1
      arch/mips/ar7/clock.c
  9. 2 1
      arch/mips/ar7/gpio.c
  10. 0 1
      arch/mips/ar7/memory.c
  11. 0 1
      arch/mips/ar7/platform.c
  12. 1 1
      arch/mips/ar7/prom.c
  13. 0 1
      arch/mips/ath79/clock.c
  14. 1 1
      arch/mips/ath79/common.c
  15. 2 1
      arch/mips/bcm63xx/clk.c
  16. 1 1
      arch/mips/bcm63xx/cpu.c
  17. 2 1
      arch/mips/bcm63xx/cs.c
  18. 1 1
      arch/mips/bcm63xx/gpio.c
  19. 0 1
      arch/mips/bcm63xx/irq.c
  20. 2 1
      arch/mips/bcm63xx/reset.c
  21. 2 1
      arch/mips/bcm63xx/timer.c
  22. 1 1
      arch/mips/cavium-octeon/crypto/octeon-crypto.c
  23. 1 1
      arch/mips/cavium-octeon/executive/cvmx-bootmem.c
  24. 1 1
      arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
  25. 1 1
      arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
  26. 2 1
      arch/mips/cavium-octeon/smp.c
  27. 1 1
      arch/mips/dec/prom/identify.c
  28. 1 1
      arch/mips/dec/setup.c
  29. 1 3
      arch/mips/dec/wbflush.c
  30. 1 1
      arch/mips/jazz/jazzdma.c
  31. 1 1
      arch/mips/jz4740/gpio.c
  32. 0 1
      arch/mips/jz4740/prom.c
  33. 2 1
      arch/mips/jz4740/timer.c
  34. 1 2
      arch/mips/lantiq/xway/dma.c
  35. 1 2
      arch/mips/lantiq/xway/gptu.c
  36. 0 1
      arch/mips/lasat/at93c.c
  37. 0 1
      arch/mips/lasat/sysctl.c
  38. 1 1
      arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
  39. 1 1
      arch/mips/loongson64/common/env.c
  40. 2 1
      arch/mips/loongson64/common/setup.c
  41. 1 1
      arch/mips/loongson64/common/uart_base.c
  42. 2 1
      arch/mips/loongson64/lemote-2f/ec_kb3310b.c
  43. 2 1
      arch/mips/loongson64/lemote-2f/irq.c
  44. 1 1
      arch/mips/loongson64/lemote-2f/pm.c
  45. 1 1
      arch/mips/loongson64/loongson-3/irq.c
  46. 1 1
      arch/mips/loongson64/loongson-3/numa.c
  47. 0 1
      arch/mips/mti-malta/malta-platform.c
  48. 1 1
      arch/mips/pmcs-msp71xx/msp_prom.c
  49. 0 1
      arch/mips/pmcs-msp71xx/msp_time.c
  50. 2 1
      arch/mips/ralink/clk.c
  51. 0 1
      arch/mips/ralink/mt7620.c
  52. 0 1
      arch/mips/ralink/mt7621.c
  53. 0 1
      arch/mips/ralink/rt288x.c
  54. 2 1
      arch/mips/ralink/rt305x.c
  55. 0 1
      arch/mips/ralink/rt3883.c
  56. 0 1
      arch/mips/rb532/irq.c
  57. 1 1
      arch/mips/rb532/prom.c
  58. 1 1
      arch/mips/sgi-ip22/ip22-hpc.c
  59. 2 1
      arch/mips/sgi-ip22/ip22-mc.c
  60. 1 1
      arch/mips/sgi-ip22/ip22-nvram.c
  61. 0 1
      arch/mips/sgi-ip22/ip22-reset.c
  62. 0 1
      arch/mips/sgi-ip22/ip22-setup.c
  63. 0 2
      arch/mips/sgi-ip27/ip27-berr.c
  64. 1 1
      arch/mips/sgi-ip27/ip27-init.c
  65. 1 1
      arch/mips/sgi-ip27/ip27-memory.c
  66. 1 1
      arch/mips/sgi-ip32/crime.c
  67. 1 1
      arch/mips/sibyte/bcm1480/setup.c
  68. 1 1
      arch/mips/sibyte/sb1250/setup.c
  69. 1 1
      arch/mips/txx9/generic/setup.c
  70. 2 1
      arch/mips/vr41xx/common/bcu.c
  71. 1 1
      arch/mips/vr41xx/common/cmu.c
  72. 1 1
      arch/mips/vr41xx/common/icu.c
  73. 1 1
      arch/mips/vr41xx/common/irq.c

+ 1 - 1
arch/mips/alchemy/common/dbdma.c

@@ -35,7 +35,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/syscore_ops.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>

+ 1 - 1
arch/mips/alchemy/common/dma.c

@@ -31,7 +31,7 @@
  */
 
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>

+ 0 - 1
arch/mips/alchemy/common/gpiolib.c

@@ -32,7 +32,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/gpio.h>
 #include <asm/mach-au1x00/gpio-au1000.h>

+ 0 - 1
arch/mips/alchemy/common/prom.c

@@ -33,7 +33,6 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/string.h>
 

+ 1 - 1
arch/mips/alchemy/common/usb.c

@@ -10,9 +10,9 @@
  */
 
 #include <linux/clk.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/syscore_ops.h>
 #include <asm/cpu.h>

+ 1 - 1
arch/mips/alchemy/common/vss.c

@@ -6,7 +6,7 @@
  * for various media blocks are enabled/disabled.
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/spinlock.h>
 #include <asm/mach-au1x00/au1000.h>
 

+ 2 - 1
arch/mips/alchemy/devboards/bcsr.c

@@ -9,7 +9,8 @@
 
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/irq.h>
 #include <asm/addrspace.h>

+ 1 - 1
arch/mips/ar7/clock.c

@@ -21,7 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/delay.h>
 #include <linux/gcd.h>
 #include <linux/io.h>

+ 2 - 1
arch/mips/ar7/gpio.c

@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/gpio.h>
 
 #include <asm/mach-ar7/ar7.h>

+ 0 - 1
arch/mips/ar7/memory.c

@@ -19,7 +19,6 @@
 #include <linux/bootmem.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/module.h>
 #include <linux/pfn.h>
 #include <linux/proc_fs.h>
 #include <linux/string.h>

+ 0 - 1
arch/mips/ar7/platform.c

@@ -19,7 +19,6 @@
 
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>

+ 1 - 1
arch/mips/ar7/prom.c

@@ -21,7 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/serial_reg.h>
 #include <linux/spinlock.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/string.h>
 #include <linux/io.h>
 #include <asm/bootinfo.h>

+ 0 - 1
arch/mips/ath79/clock.c

@@ -12,7 +12,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/clk.h>

+ 1 - 1
arch/mips/ath79/common.c

@@ -13,7 +13,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/spinlock.h>
 

+ 2 - 1
arch/mips/bcm63xx/clk.c

@@ -6,7 +6,8 @@
  * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/mutex.h>
 #include <linux/err.h>
 #include <linux/clk.h>

+ 1 - 1
arch/mips/bcm63xx/cpu.c

@@ -8,7 +8,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/cpu.h>
 #include <asm/cpu.h>
 #include <asm/cpu-info.h>

+ 2 - 1
arch/mips/bcm63xx/cs.c

@@ -7,7 +7,8 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/log2.h>
 #include <bcm63xx_cpu.h>

+ 1 - 1
arch/mips/bcm63xx/gpio.c

@@ -8,7 +8,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
 #include <linux/gpio/driver.h>

+ 0 - 1
arch/mips/bcm63xx/irq.c

@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
 #include <linux/irq.h>
 #include <linux/spinlock.h>
 #include <asm/irq_cpu.h>

+ 2 - 1
arch/mips/bcm63xx/reset.c

@@ -6,7 +6,8 @@
  * Copyright (C) 2012 Jonas Gorski <jonas.gorski@gmail.com>
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/mutex.h>
 #include <linux/err.h>
 #include <linux/clk.h>

+ 2 - 1
arch/mips/bcm63xx/timer.c

@@ -8,7 +8,8 @@
 
 #include <linux/kernel.h>
 #include <linux/err.h>
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>

+ 1 - 1
arch/mips/cavium-octeon/crypto/octeon-crypto.c

@@ -7,7 +7,7 @@
  */
 
 #include <asm/cop2.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/interrupt.h>
 
 #include "octeon-crypto.h"

+ 1 - 1
arch/mips/cavium-octeon/executive/cvmx-bootmem.c

@@ -30,8 +30,8 @@
  * application start time.
  */
 
+#include <linux/export.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 
 #include <asm/octeon/cvmx.h>
 #include <asm/octeon/cvmx-spinlock.h>

+ 1 - 1
arch/mips/cavium-octeon/executive/cvmx-helper-errata.c

@@ -33,7 +33,7 @@
  * these functions directly.
  *
  */
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include <asm/octeon/octeon.h>
 

+ 1 - 1
arch/mips/cavium-octeon/executive/cvmx-sysinfo.c

@@ -29,7 +29,7 @@
  * This module provides system/board/application information obtained
  * by the bootloader.
  */
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include <asm/octeon/cvmx.h>
 #include <asm/octeon/cvmx-sysinfo.h>

+ 2 - 1
arch/mips/cavium-octeon/smp.c

@@ -11,7 +11,8 @@
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 #include <linux/sched.h>
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 
 #include <asm/mmu_context.h>
 #include <asm/time.h>

+ 1 - 1
arch/mips/dec/prom/identify.c

@@ -7,7 +7,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mc146818rtc.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/string.h>
 #include <linux/types.h>
 

+ 1 - 1
arch/mips/dec/setup.c

@@ -9,12 +9,12 @@
  * Copyright (C) 2000, 2001, 2002, 2003, 2005  Maciej W. Rozycki
  */
 #include <linux/console.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/irq.h>
 #include <linux/irqnr.h>
-#include <linux/module.h>
 #include <linux/param.h>
 #include <linux/percpu-defs.h>
 #include <linux/sched.h>

+ 1 - 3
arch/mips/dec/wbflush.c

@@ -14,6 +14,7 @@
  * Copyright (C) 2002 Maciej W. Rozycki
  */
 
+#include <linux/export.h>
 #include <linux/init.h>
 
 #include <asm/bootinfo.h>
@@ -88,7 +89,4 @@ static void wbflush_mips(void)
 {
 	__fast_iob();
 }
-
-#include <linux/module.h>
-
 EXPORT_SYMBOL(__wbflush);

+ 1 - 1
arch/mips/jazz/jazzdma.c

@@ -9,7 +9,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>

+ 1 - 1
arch/mips/jz4740/gpio.c

@@ -14,7 +14,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/init.h>
 
 #include <linux/io.h>

+ 0 - 1
arch/mips/jz4740/prom.c

@@ -13,7 +13,6 @@
  *
  */
 
-#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/string.h>

+ 2 - 1
arch/mips/jz4740/timer.c

@@ -13,9 +13,10 @@
  *
  */
 
+#include <linux/export.h>
 #include <linux/io.h>
+#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 
 #include <asm/mach-jz4740/base.h>
 #include <asm/mach-jz4740/timer.h>

+ 1 - 2
arch/mips/lantiq/xway/dma.c

@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/dma-mapping.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/clk.h>
 #include <linux/err.h>
@@ -257,7 +257,6 @@ static const struct of_device_id dma_match[] = {
 	{ .compatible = "lantiq,dma-xway" },
 	{},
 };
-MODULE_DEVICE_TABLE(of, dma_match);
 
 static struct platform_driver dma_driver = {
 	.probe = ltq_dma_init,

+ 1 - 2
arch/mips/lantiq/xway/gptu.c

@@ -9,7 +9,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of_platform.h>
 #include <linux/of_irq.h>
 
@@ -187,7 +187,6 @@ static const struct of_device_id gptu_match[] = {
 	{ .compatible = "lantiq,gptu-xway" },
 	{},
 };
-MODULE_DEVICE_TABLE(of, dma_match);
 
 static struct platform_driver dma_driver = {
 	.probe = gptu_probe,

+ 0 - 1
arch/mips/lasat/at93c.c

@@ -7,7 +7,6 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <asm/lasat/lasat.h>
-#include <linux/module.h>
 
 #include "at93c.h"
 

+ 0 - 1
arch/mips/lasat/sysctl.c

@@ -20,7 +20,6 @@
 #include <linux/types.h>
 #include <asm/lasat/lasat.h>
 
-#include <linux/module.h>
 #include <linux/sysctl.h>
 #include <linux/stddef.h>
 #include <linux/init.h>

+ 1 - 1
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c

@@ -17,7 +17,7 @@
 
 #include <linux/io.h>
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/jiffies.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>

+ 1 - 1
arch/mips/loongson64/common/env.c

@@ -17,7 +17,7 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
-#include <linux/module.h>
+#include <linux/export.h>
 #include <asm/bootinfo.h>
 #include <loongson.h>
 #include <boot_param.h>

+ 2 - 1
arch/mips/loongson64/common/setup.c

@@ -7,7 +7,8 @@
  *  Free Software Foundation;  either version 2 of the	License, or (at your
  *  option) any later version.
  */
-#include <linux/module.h>
+#include <linux/export.h>
+#include <linux/init.h>
 
 #include <asm/wbflush.h>
 #include <asm/bootinfo.h>

+ 1 - 1
arch/mips/loongson64/common/uart_base.c

@@ -8,7 +8,7 @@
  * option) any later version.
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <asm/bootinfo.h>
 
 #include <loongson.h>

+ 2 - 1
arch/mips/loongson64/lemote-2f/ec_kb3310b.c

@@ -10,7 +10,8 @@
  * (at your option) any later version.
  */
 
-#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
 

+ 2 - 1
arch/mips/loongson64/lemote-2f/irq.c

@@ -8,8 +8,9 @@
  *  option) any later version.
  */
 
+#include <linux/export.h>
+#include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
 
 #include <asm/irq_cpu.h>
 #include <asm/i8259.h>

+ 1 - 1
arch/mips/loongson64/lemote-2f/pm.c

@@ -14,7 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/pm.h>
 #include <linux/i8042.h>
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include <asm/i8259.h>
 #include <asm/mipsregs.h>

+ 1 - 1
arch/mips/loongson64/loongson-3/irq.c

@@ -1,7 +1,7 @@
 #include <loongson.h>
 #include <irq.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
+#include <linux/init.h>
 
 #include <asm/irq_cpu.h>
 #include <asm/i8259.h>

+ 1 - 1
arch/mips/loongson64/loongson-3/numa.c

@@ -14,7 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/nodemask.h>
 #include <linux/swap.h>
 #include <linux/memblock.h>

+ 0 - 1
arch/mips/mti-malta/malta-platform.c

@@ -23,7 +23,6 @@
  */
 #include <linux/init.h>
 #include <linux/serial_8250.h>
-#include <linux/module.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <asm/mips-boards/maltaint.h>

+ 1 - 1
arch/mips/pmcs-msp71xx/msp_prom.c

@@ -34,7 +34,7 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/string.h>

+ 0 - 1
arch/mips/pmcs-msp71xx/msp_time.c

@@ -26,7 +26,6 @@
 #include <linux/kernel_stat.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-#include <linux/module.h>
 #include <linux/ptrace.h>
 
 #include <asm/cevt-r4k.h>

+ 2 - 1
arch/mips/ralink/clk.c

@@ -8,7 +8,8 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/clkdev.h>
 #include <linux/clk.h>
 

+ 0 - 1
arch/mips/ralink/mt7620.c

@@ -12,7 +12,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/module.h>
 
 #include <asm/mipsregs.h>
 #include <asm/mach-ralink/ralink_regs.h>

+ 0 - 1
arch/mips/ralink/mt7621.c

@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/module.h>
 
 #include <asm/mipsregs.h>
 #include <asm/smp-ops.h>

+ 0 - 1
arch/mips/ralink/rt288x.c

@@ -12,7 +12,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/module.h>
 
 #include <asm/mipsregs.h>
 #include <asm/mach-ralink/ralink_regs.h>

+ 2 - 1
arch/mips/ralink/rt305x.c

@@ -12,8 +12,9 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/bug.h>
 
+#include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/mach-ralink/ralink_regs.h>
 #include <asm/mach-ralink/rt305x.h>

+ 0 - 1
arch/mips/ralink/rt3883.c

@@ -12,7 +12,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/module.h>
 
 #include <asm/mipsregs.h>
 #include <asm/mach-ralink/ralink_regs.h>

+ 0 - 1
arch/mips/rb532/irq.c

@@ -29,7 +29,6 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel_stat.h>
-#include <linux/module.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/types.h>

+ 1 - 1
arch/mips/rb532/prom.c

@@ -26,7 +26,7 @@
 
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/string.h>
 #include <linux/console.h>
 #include <linux/bootmem.h>

+ 1 - 1
arch/mips/sgi-ip22/ip22-hpc.c

@@ -5,8 +5,8 @@
  * Copyright (C) 1998 Ralf Baechle
  */
 
+#include <linux/export.h>
 #include <linux/init.h>
-#include <linux/module.h>
 #include <linux/types.h>
 
 #include <asm/io.h>

+ 2 - 1
arch/mips/sgi-ip22/ip22-mc.c

@@ -8,8 +8,9 @@
  */
 
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/kernel.h>
+#include <linux/spinlock.h>
 
 #include <asm/io.h>
 #include <asm/bootinfo.h>

+ 1 - 1
arch/mips/sgi-ip22/ip22-nvram.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003 Ladislav Michl (ladis@linux-mips.org)
  */
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include <asm/sgi/hpc3.h>
 #include <asm/sgi/ip22.h>

+ 0 - 1
arch/mips/sgi-ip22/ip22-reset.c

@@ -8,7 +8,6 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/rtc/ds1286.h>
-#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

+ 0 - 1
arch/mips/sgi-ip22/ip22-setup.c

@@ -8,7 +8,6 @@
 #include <linux/kernel.h>
 #include <linux/kdev_t.h>
 #include <linux/types.h>
-#include <linux/module.h>
 #include <linux/console.h>
 #include <linux/sched.h>
 #include <linux/tty.h>

+ 0 - 2
arch/mips/sgi-ip27/ip27-berr.c

@@ -9,11 +9,9 @@
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/signal.h>	/* for SIGBUS */
 #include <linux/sched.h>	/* schow_regs(), force_sig() */
 
-#include <asm/module.h>
 #include <asm/sn/addrs.h>
 #include <asm/sn/arch.h>
 #include <asm/sn/sn0/hub.h>

+ 1 - 1
arch/mips/sgi-ip27/ip27-init.c

@@ -11,7 +11,7 @@
 #include <linux/sched.h>
 #include <linux/smp.h>
 #include <linux/mm.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/cpumask.h>
 #include <asm/cpu.h>
 #include <asm/io.h>

+ 1 - 1
arch/mips/sgi-ip27/ip27-memory.c

@@ -15,7 +15,7 @@
 #include <linux/memblock.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/nodemask.h>
 #include <linux/swap.h>
 #include <linux/bootmem.h>

+ 1 - 1
arch/mips/sgi-ip32/crime.c

@@ -10,7 +10,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

+ 1 - 1
arch/mips/sibyte/bcm1480/setup.c

@@ -17,7 +17,7 @@
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/reboot.h>
 #include <linux/string.h>
 

+ 1 - 1
arch/mips/sibyte/sb1250/setup.c

@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+#include <linux/export.h>
 #include <linux/init.h>
-#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/reboot.h>
 #include <linux/string.h>

+ 1 - 1
arch/mips/txx9/generic/setup.c

@@ -14,7 +14,7 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/string.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/err.h>

+ 2 - 1
arch/mips/vr41xx/common/bcu.c

@@ -28,11 +28,12 @@
  *  Yoichi Yuasa <yuasa@linux-mips.org>
  *  - Added support for NEC VR4133.
  */
+#include <linux/export.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/types.h>
 
+#include <asm/cpu-type.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
 

+ 1 - 1
arch/mips/vr41xx/common/cmu.c

@@ -28,9 +28,9 @@
  *  Yoichi Yuasa <yuasa@linux-mips.org>
  *  - Added support for NEC VR4133.
  */
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>

+ 1 - 1
arch/mips/vr41xx/common/icu.c

@@ -29,10 +29,10 @@
  *  - Coped with INTASSIGN of NEC VR4133.
  */
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/irq.h>
-#include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/types.h>
 

+ 1 - 1
arch/mips/vr41xx/common/irq.c

@@ -17,8 +17,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <linux/export.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
 #include <linux/irq.h>
 
 #include <asm/irq_cpu.h>