Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: malta: remove mach-malta/malta-dtshim.h header file

To clean up mach-* directories move external declaration of malta_dt_shim()
to mips-boards/malta.h and remove malta-dtshim.h.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

+2 -26
-25
arch/mips/include/asm/mach-malta/malta-dtshim.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0-or-later */ 2 - /* 3 - * Copyright (C) 2015 Imagination Technologies 4 - * Author: Paul Burton <paul.burton@mips.com> 5 - */ 6 - 7 - #ifndef __MIPS_MALTA_DTSHIM_H__ 8 - #define __MIPS_MALTA_DTSHIM_H__ 9 - 10 - #include <linux/init.h> 11 - 12 - #ifdef CONFIG_MIPS_MALTA 13 - 14 - extern void __init *malta_dt_shim(void *fdt); 15 - 16 - #else /* !CONFIG_MIPS_MALTA */ 17 - 18 - static inline void *malta_dt_shim(void *fdt) 19 - { 20 - return fdt; 21 - } 22 - 23 - #endif /* !CONFIG_MIPS_MALTA */ 24 - 25 - #endif /* __MIPS_MALTA_DTSHIM_H__ */
+2
arch/mips/include/asm/mips-boards/malta.h
··· 92 92 93 93 #define MALTA_JMPRS_REG 0x1f000210 94 94 95 + extern void __init *malta_dt_shim(void *fdt); 96 + 95 97 #endif /* __ASM_MIPS_BOARDS_MALTA_H */
-1
arch/mips/mti-malta/malta-setup.c
··· 16 16 17 17 #include <asm/dma-coherence.h> 18 18 #include <asm/fw/fw.h> 19 - #include <asm/mach-malta/malta-dtshim.h> 20 19 #include <asm/mips-cps.h> 21 20 #include <asm/mips-boards/generic.h> 22 21 #include <asm/mips-boards/malta.h>