diff mbox series

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

Message ID 20200920211343.117262-1-tsbogend@alpha.franken.de (mailing list archive)
State Accepted
Commit 307c9926393aed6c48600bea218b9565f2292fcb
Headers show
Series MIPS: malta: remove mach-malta/malta-dtshim.h header file | expand

Commit Message

Thomas Bogendoerfer Sept. 20, 2020, 9:13 p.m. UTC 
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>
---
 arch/mips/include/asm/mach-malta/malta-dtshim.h | 25 -------------------------
 arch/mips/include/asm/mips-boards/malta.h       |  2 ++
 arch/mips/mti-malta/malta-setup.c               |  1 -
 3 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 arch/mips/include/asm/mach-malta/malta-dtshim.h

Comments

Thomas Bogendoerfer Sept. 21, 2020, 8:31 p.m. UTC | #1 
On Sun, Sep 20, 2020 at 11:13:42PM +0200, Thomas Bogendoerfer wrote:
> 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>
> ---
>  arch/mips/include/asm/mach-malta/malta-dtshim.h | 25 -------------------------
>  arch/mips/include/asm/mips-boards/malta.h       |  2 ++
>  arch/mips/mti-malta/malta-setup.c               |  1 -
>  3 files changed, 2 insertions(+), 26 deletions(-)
>  delete mode 100644 arch/mips/include/asm/mach-malta/malta-dtshim.h

applied to mips-next.

Thomas.
diff mbox series

Patch

diff --git a/arch/mips/include/asm/mach-malta/malta-dtshim.h b/arch/mips/include/asm/mach-malta/malta-dtshim.h
deleted file mode 100644
index 7c97b710121d..000000000000
--- a/arch/mips/include/asm/mach-malta/malta-dtshim.h
+++ /dev/null
@@ -1,25 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@mips.com>
- */
-
-#ifndef __MIPS_MALTA_DTSHIM_H__
-#define __MIPS_MALTA_DTSHIM_H__
-
-#include <linux/init.h>
-
-#ifdef CONFIG_MIPS_MALTA
-
-extern void __init *malta_dt_shim(void *fdt);
-
-#else /* !CONFIG_MIPS_MALTA */
-
-static inline void *malta_dt_shim(void *fdt)
-{
-	return fdt;
-}
-
-#endif /* !CONFIG_MIPS_MALTA */
-
-#endif /* __MIPS_MALTA_DTSHIM_H__ */
diff --git a/arch/mips/include/asm/mips-boards/malta.h b/arch/mips/include/asm/mips-boards/malta.h
index 65de4fb06096..254be3d62519 100644
--- a/arch/mips/include/asm/mips-boards/malta.h
+++ b/arch/mips/include/asm/mips-boards/malta.h
@@ -92,4 +92,6 @@  static inline unsigned long get_msc_port_base(unsigned long reg)
 
 #define MALTA_JMPRS_REG		0x1f000210
 
+extern void __init *malta_dt_shim(void *fdt);
+
 #endif /* __ASM_MIPS_BOARDS_MALTA_H */
diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c
index c4ad5a9b4bc1..e1fb8b534944 100644
--- a/arch/mips/mti-malta/malta-setup.c
+++ b/arch/mips/mti-malta/malta-setup.c
@@ -16,7 +16,6 @@ 
 
 #include <asm/dma-coherence.h>
 #include <asm/fw/fw.h>
-#include <asm/mach-malta/malta-dtshim.h>
 #include <asm/mips-cps.h>
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/malta.h>