ARM: shmobile: Minor header cleanup

ARM: shmobile: Minor header cleanup

[PATCH 01/03] ARM: shmobile: Remove mach/system.h [PATCH 02/03] ARM: shmobile: Remove mach/clkdev.h [PATCH 03/03] ARM: shmobile: Remove mach/uncompress.h

Rework the mach-shmobile code a bit more to allow removing the files system.h, clkdev.h and uncompress.h from arch/arm/mach-shmobile/include/mach/

---

Built on top of renesas-devel-20150119-v3.19-rc5

 arch/arm/Kconfig                                 |    1 -
 arch/arm/Kconfig.debug                           |    3 ++-
 arch/arm/mach-shmobile/clock.c                   |   11 -----------
 arch/arm/mach-shmobile/include/mach/clkdev.h     |    7 -------
 arch/arm/mach-shmobile/include/mach/system.h     |   11 -----------
 arch/arm/mach-shmobile/include/mach/uncompress.h |   19 -------------------
 6 files changed, 2 insertions(+), 50 deletions(-)

From: Magnus Damm <[email protected]>

The file <mach/system.h> is no longer included from anywhere so clean up the code by removing mach-shmobile/include/mach/system.h

---

Applies to renesas-devel-20150119-v3.19-rc5

 arch/arm/mach-shmobile/include/mach/system.h |   11 -----------
 1 file changed, 11 deletions(-)

@@ -1,11 +0,0 @@
-#ifndef __ASM_ARCH_SYSTEM_H
-#define __ASM_ARCH_SYSTEM_H
-
-#include <asm/system_misc.h>
-
-static inline void arch_reset(char mode, const char *cmd)
-{
-	soft_restart(0);
-}
-
-#endif

From: Magnus Damm <[email protected]>

Move over ARCH_SHMOBILE_LEGACY to use the default legacy ARM implementations of __clk_get() and __clk_put() in <asm/clkdev.h> by deselecting HAVE_MACH_CLKDEV. This has the nice side effect that <mach/clkdev.h> is no longer used and can be removed.

---

 arch/arm/Kconfig                             |    1 -
 arch/arm/mach-shmobile/clock.c               |   11 -----------
 arch/arm/mach-shmobile/include/mach/clkdev.h |    7 -------
 3 files changed, 19 deletions(-)

@@ -644,7 +644,6 @@ config ARCH_SHMOBILE_LEGACY
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select HAVE_MACH_CLKDEV
 	select HAVE_SMP
 	select MIGHT_HAVE_CACHE_L2X0
 	select MULTI_IRQ_HANDLER

@@ -45,14 +45,3 @@ int __init shmobile_clk_init(void)
 
 	return 0;
 }
-
-int __clk_get(struct clk *clk)
-{
-	return 1;
-}
-EXPORT_SYMBOL(__clk_get);
-
-void __clk_put(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(__clk_put);

@@ -1,7 +0,0 @@
-#ifndef __ASM_MACH_CLKDEV_H
-#define __ASM_MACH_CLKDEV_H
-
-int __clk_get(struct clk *clk);
-void __clk_put(struct clk *clk);
-
-#endif /* __ASM_MACH_CLKDEV_H */

From: Magnus Damm <[email protected]>

Convert ARCH_SHMOBILE_LEGACY to make use of <debug/uncompress.h> and remove the now unused <mach/uncompress.h>.

---

 arch/arm/Kconfig.debug                           |    3 ++-
 arch/arm/mach-shmobile/include/mach/uncompress.h |   19 -------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

@@ -1441,7 +1441,8 @@ config DEBUG_UNCOMPRESS
 config UNCOMPRESS_INCLUDE
 	string
 	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
-					PLAT_SAMSUNG || ARCH_EFM32
+					PLAT_SAMSUNG || ARCH_EFM32 || \
+					ARCH_SHMOBILE_LEGACY
 	default "mach/uncompress.h"
 
 config EARLY_PRINTK

@@ -1,19 +0,0 @@
-#ifndef __ASM_MACH_UNCOMPRESS_H
-#define __ASM_MACH_UNCOMPRESS_H
-
-/*
- * This does not append a newline
- */
-static void putc(int c)
-{
-}
-
-static inline void flush(void)
-{
-}
-
-static void arch_decomp_setup(void)
-{
-}
-
-#endif /* __ASM_MACH_UNCOMPRESS_H */

Hi Magnus,

Thank you for the patches.

Nice, mach-shmobile is getting slimmer, I like that :-)

For the whole series,

Regards,

Laurent Pinchart

Hi Magnus,

Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Thanks, I have queued this up for v3.21 with Laurent and Geert's Acks.