Skip to content

Commit 26dd3e4

Browse files
Paul GortmakerJames Hogan
Paul Gortmaker
authored and
James Hogan
committed
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>
1 parent 2654294 commit 26dd3e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+69
-78
lines changed

‎arch/mips/alchemy/common/dbdma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <linux/slab.h>
3636
#include <linux/spinlock.h>
3737
#include <linux/interrupt.h>
38-
#include <linux/module.h>
38+
#include <linux/export.h>
3939
#include <linux/syscore_ops.h>
4040
#include <asm/mach-au1x00/au1000.h>
4141
#include <asm/mach-au1x00/au1xxx_dbdma.h>

‎arch/mips/alchemy/common/dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232

3333
#include <linux/init.h>
34-
#include <linux/module.h>
34+
#include <linux/export.h>
3535
#include <linux/kernel.h>
3636
#include <linux/errno.h>
3737
#include <linux/spinlock.h>

‎arch/mips/alchemy/common/gpiolib.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
#include <linux/init.h>
3434
#include <linux/kernel.h>
35-
#include <linux/module.h>
3635
#include <linux/types.h>
3736
#include <linux/gpio.h>
3837
#include <asm/mach-au1x00/gpio-au1000.h>

‎arch/mips/alchemy/common/prom.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
* 675 Mass Ave, Cambridge, MA 02139, USA.
3434
*/
3535

36-
#include <linux/module.h>
3736
#include <linux/init.h>
3837
#include <linux/string.h>
3938

‎arch/mips/alchemy/common/usb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
*/
1111

1212
#include <linux/clk.h>
13+
#include <linux/export.h>
1314
#include <linux/init.h>
1415
#include <linux/io.h>
15-
#include <linux/module.h>
1616
#include <linux/spinlock.h>
1717
#include <linux/syscore_ops.h>
1818
#include <asm/cpu.h>

‎arch/mips/alchemy/common/vss.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* for various media blocks are enabled/disabled.
77
*/
88

9-
#include <linux/module.h>
9+
#include <linux/export.h>
1010
#include <linux/spinlock.h>
1111
#include <asm/mach-au1x00/au1000.h>
1212

‎arch/mips/alchemy/devboards/bcsr.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
#include <linux/interrupt.h>
1111
#include <linux/irqchip/chained_irq.h>
12-
#include <linux/module.h>
12+
#include <linux/init.h>
13+
#include <linux/export.h>
1314
#include <linux/spinlock.h>
1415
#include <linux/irq.h>
1516
#include <asm/addrspace.h>

‎arch/mips/ar7/clock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <linux/kernel.h>
2222
#include <linux/init.h>
2323
#include <linux/types.h>
24-
#include <linux/module.h>
24+
#include <linux/export.h>
2525
#include <linux/delay.h>
2626
#include <linux/gcd.h>
2727
#include <linux/io.h>

‎arch/mips/ar7/gpio.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1919
*/
2020

21-
#include <linux/module.h>
21+
#include <linux/init.h>
22+
#include <linux/export.h>
2223
#include <linux/gpio.h>
2324

2425
#include <asm/mach-ar7/ar7.h>

‎arch/mips/ar7/memory.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/bootmem.h>
2020
#include <linux/init.h>
2121
#include <linux/mm.h>
22-
#include <linux/module.h>
2322
#include <linux/pfn.h>
2423
#include <linux/proc_fs.h>
2524
#include <linux/string.h>

‎arch/mips/ar7/platform.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <linux/init.h>
2121
#include <linux/types.h>
22-
#include <linux/module.h>
2322
#include <linux/delay.h>
2423
#include <linux/dma-mapping.h>
2524
#include <linux/platform_device.h>

‎arch/mips/ar7/prom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <linux/kernel.h>
2222
#include <linux/serial_reg.h>
2323
#include <linux/spinlock.h>
24-
#include <linux/module.h>
24+
#include <linux/export.h>
2525
#include <linux/string.h>
2626
#include <linux/io.h>
2727
#include <asm/bootinfo.h>

‎arch/mips/ath79/clock.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313

1414
#include <linux/kernel.h>
15-
#include <linux/module.h>
1615
#include <linux/init.h>
1716
#include <linux/err.h>
1817
#include <linux/clk.h>

‎arch/mips/ath79/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414

1515
#include <linux/kernel.h>
16-
#include <linux/module.h>
16+
#include <linux/export.h>
1717
#include <linux/types.h>
1818
#include <linux/spinlock.h>
1919

‎arch/mips/bcm63xx/clk.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
* Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
77
*/
88

9-
#include <linux/module.h>
9+
#include <linux/init.h>
10+
#include <linux/export.h>
1011
#include <linux/mutex.h>
1112
#include <linux/err.h>
1213
#include <linux/clk.h>

‎arch/mips/bcm63xx/cpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include <linux/kernel.h>
11-
#include <linux/module.h>
11+
#include <linux/export.h>
1212
#include <linux/cpu.h>
1313
#include <asm/cpu.h>
1414
#include <asm/cpu-info.h>

‎arch/mips/bcm63xx/cs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*/
88

99
#include <linux/kernel.h>
10-
#include <linux/module.h>
10+
#include <linux/errno.h>
11+
#include <linux/export.h>
1112
#include <linux/spinlock.h>
1213
#include <linux/log2.h>
1314
#include <bcm63xx_cpu.h>

‎arch/mips/bcm63xx/gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include <linux/kernel.h>
11-
#include <linux/module.h>
11+
#include <linux/init.h>
1212
#include <linux/spinlock.h>
1313
#include <linux/platform_device.h>
1414
#include <linux/gpio/driver.h>

‎arch/mips/bcm63xx/irq.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <linux/kernel.h>
1111
#include <linux/init.h>
1212
#include <linux/interrupt.h>
13-
#include <linux/module.h>
1413
#include <linux/irq.h>
1514
#include <linux/spinlock.h>
1615
#include <asm/irq_cpu.h>

‎arch/mips/bcm63xx/reset.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
* Copyright (C) 2012 Jonas Gorski <jonas.gorski@gmail.com>
77
*/
88

9-
#include <linux/module.h>
9+
#include <linux/init.h>
10+
#include <linux/export.h>
1011
#include <linux/mutex.h>
1112
#include <linux/err.h>
1213
#include <linux/clk.h>

‎arch/mips/bcm63xx/timer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
#include <linux/kernel.h>
1010
#include <linux/err.h>
11-
#include <linux/module.h>
11+
#include <linux/init.h>
12+
#include <linux/export.h>
1213
#include <linux/spinlock.h>
1314
#include <linux/interrupt.h>
1415
#include <linux/clk.h>

‎arch/mips/cavium-octeon/crypto/octeon-crypto.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
#include <asm/cop2.h>
10-
#include <linux/module.h>
10+
#include <linux/export.h>
1111
#include <linux/interrupt.h>
1212

1313
#include "octeon-crypto.h"

‎arch/mips/cavium-octeon/executive/cvmx-bootmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
* application start time.
3131
*/
3232

33+
#include <linux/export.h>
3334
#include <linux/kernel.h>
34-
#include <linux/module.h>
3535

3636
#include <asm/octeon/cvmx.h>
3737
#include <asm/octeon/cvmx-spinlock.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* these functions directly.
3434
*
3535
*/
36-
#include <linux/module.h>
36+
#include <linux/export.h>
3737

3838
#include <asm/octeon/octeon.h>
3939

‎arch/mips/cavium-octeon/executive/cvmx-sysinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* This module provides system/board/application information obtained
3030
* by the bootloader.
3131
*/
32-
#include <linux/module.h>
32+
#include <linux/export.h>
3333

3434
#include <asm/octeon/cvmx.h>
3535
#include <asm/octeon/cvmx-sysinfo.h>

‎arch/mips/cavium-octeon/smp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
#include <linux/interrupt.h>
1212
#include <linux/kernel_stat.h>
1313
#include <linux/sched.h>
14-
#include <linux/module.h>
14+
#include <linux/init.h>
15+
#include <linux/export.h>
1516

1617
#include <asm/mmu_context.h>
1718
#include <asm/time.h>

‎arch/mips/dec/prom/identify.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <linux/init.h>
88
#include <linux/kernel.h>
99
#include <linux/mc146818rtc.h>
10-
#include <linux/module.h>
10+
#include <linux/export.h>
1111
#include <linux/string.h>
1212
#include <linux/types.h>
1313

‎arch/mips/dec/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* Copyright (C) 2000, 2001, 2002, 2003, 2005 Maciej W. Rozycki
1010
*/
1111
#include <linux/console.h>
12+
#include <linux/export.h>
1213
#include <linux/init.h>
1314
#include <linux/interrupt.h>
1415
#include <linux/ioport.h>
1516
#include <linux/irq.h>
1617
#include <linux/irqnr.h>
17-
#include <linux/module.h>
1818
#include <linux/param.h>
1919
#include <linux/percpu-defs.h>
2020
#include <linux/sched.h>

‎arch/mips/dec/wbflush.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* Copyright (C) 2002 Maciej W. Rozycki
1515
*/
1616

17+
#include <linux/export.h>
1718
#include <linux/init.h>
1819

1920
#include <asm/bootinfo.h>
@@ -88,7 +89,4 @@ static void wbflush_mips(void)
8889
{
8990
__fast_iob();
9091
}
91-
92-
#include <linux/module.h>
93-
9492
EXPORT_SYMBOL(__wbflush);

‎arch/mips/jazz/jazzdma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
#include <linux/kernel.h>
1111
#include <linux/init.h>
12-
#include <linux/module.h>
12+
#include <linux/export.h>
1313
#include <linux/errno.h>
1414
#include <linux/mm.h>
1515
#include <linux/bootmem.h>

‎arch/mips/jz4740/gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
#include <linux/kernel.h>
17-
#include <linux/module.h>
17+
#include <linux/export.h>
1818
#include <linux/init.h>
1919

2020
#include <linux/io.h>

‎arch/mips/jz4740/prom.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
*
1414
*/
1515

16-
#include <linux/module.h>
1716
#include <linux/kernel.h>
1817
#include <linux/init.h>
1918
#include <linux/string.h>

‎arch/mips/jz4740/timer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
*
1414
*/
1515

16+
#include <linux/export.h>
1617
#include <linux/io.h>
18+
#include <linux/init.h>
1719
#include <linux/kernel.h>
18-
#include <linux/module.h>
1920

2021
#include <asm/mach-jz4740/base.h>
2122
#include <asm/mach-jz4740/timer.h>

‎arch/mips/lantiq/xway/dma.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <linux/platform_device.h>
2020
#include <linux/io.h>
2121
#include <linux/dma-mapping.h>
22-
#include <linux/module.h>
22+
#include <linux/export.h>
2323
#include <linux/spinlock.h>
2424
#include <linux/clk.h>
2525
#include <linux/err.h>
@@ -257,7 +257,6 @@ static const struct of_device_id dma_match[] = {
257257
{ .compatible = "lantiq,dma-xway" },
258258
{},
259259
};
260-
MODULE_DEVICE_TABLE(of, dma_match);
261260

262261
static struct platform_driver dma_driver = {
263262
.probe = ltq_dma_init,

‎arch/mips/lantiq/xway/gptu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <linux/interrupt.h>
1111
#include <linux/ioport.h>
12-
#include <linux/module.h>
12+
#include <linux/init.h>
1313
#include <linux/of_platform.h>
1414
#include <linux/of_irq.h>
1515

@@ -187,7 +187,6 @@ static const struct of_device_id gptu_match[] = {
187187
{ .compatible = "lantiq,gptu-xway" },
188188
{},
189189
};
190-
MODULE_DEVICE_TABLE(of, dma_match);
191190

192191
static struct platform_driver dma_driver = {
193192
.probe = gptu_probe,

‎arch/mips/lasat/at93c.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <linux/kernel.h>
88
#include <linux/delay.h>
99
#include <asm/lasat/lasat.h>
10-
#include <linux/module.h>
1110

1211
#include "at93c.h"
1312

‎arch/mips/lasat/sysctl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <linux/types.h>
2121
#include <asm/lasat/lasat.h>
2222

23-
#include <linux/module.h>
2423
#include <linux/sysctl.h>
2524
#include <linux/stddef.h>
2625
#include <linux/init.h>

‎arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include <linux/io.h>
1919
#include <linux/init.h>
20-
#include <linux/module.h>
20+
#include <linux/export.h>
2121
#include <linux/jiffies.h>
2222
#include <linux/spinlock.h>
2323
#include <linux/interrupt.h>

‎arch/mips/loongson64/common/env.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Free Software Foundation; either version 2 of the License, or (at your
1818
* option) any later version.
1919
*/
20-
#include <linux/module.h>
20+
#include <linux/export.h>
2121
#include <asm/bootinfo.h>
2222
#include <loongson.h>
2323
#include <boot_param.h>

‎arch/mips/loongson64/common/setup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
* Free Software Foundation; either version 2 of the License, or (at your
88
* option) any later version.
99
*/
10-
#include <linux/module.h>
10+
#include <linux/export.h>
11+
#include <linux/init.h>
1112

1213
#include <asm/wbflush.h>
1314
#include <asm/bootinfo.h>

0 commit comments

Comments
 (0)