diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-01-28 21:05:57 -0500 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2017-02-14 09:00:25 +0000 |
| commit | 26dd3e4ff9ac1aa576c97d23d7425d2544dbc5bf (patch) | |
| tree | 847dd13b8e87ae1a4dfcf20bef370728e2177e54 /arch/mips/ralink | |
| parent | 2654294bac83a64101c360eac4d42d5ac1b1b911 (diff) | |
| download | linux-26dd3e4ff9ac1aa576c97d23d7425d2544dbc5bf.tar.bz2 | |
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>
Diffstat (limited to 'arch/mips/ralink')
| -rw-r--r-- | arch/mips/ralink/clk.c | 3 | ||||
| -rw-r--r-- | arch/mips/ralink/mt7620.c | 1 | ||||
| -rw-r--r-- | arch/mips/ralink/mt7621.c | 1 | ||||
| -rw-r--r-- | arch/mips/ralink/rt288x.c | 1 | ||||
| -rw-r--r-- | arch/mips/ralink/rt305x.c | 3 | ||||
| -rw-r--r-- | arch/mips/ralink/rt3883.c | 1 |
6 files changed, 4 insertions, 6 deletions
diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c index 64c3db5e8e8a..df795885eace 100644 --- a/arch/mips/ralink/clk.c +++ b/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> diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c index 76416b487564..094a0ee4af46 100644 --- a/arch/mips/ralink/mt7620.c +++ b/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> diff --git a/arch/mips/ralink/mt7621.c b/arch/mips/ralink/mt7621.c index 3ffa4ba78131..0695c2d64e49 100644 --- a/arch/mips/ralink/mt7621.c +++ b/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> diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c index 40d3a69c7016..60e44cc8d2c9 100644 --- a/arch/mips/ralink/rt288x.c +++ b/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> diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c index 01f7cd38d631..93d472c60ce4 100644 --- a/arch/mips/ralink/rt305x.c +++ b/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> diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c index 252b64114b48..c4ffd43d3996 100644 --- a/arch/mips/ralink/rt3883.c +++ b/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> |