* [PATCH 00/03] ARM: shmobile: Minor header cleanup
@ 2015-01-20 11:57 Magnus Damm
2015-01-20 11:58 ` [PATCH 01/03] ARM: shmobile: Remove mach/system.h Magnus Damm
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Magnus Damm @ 2015-01-20 11:57 UTC (permalink / raw)
To: linux-arm-kernel
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/
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
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(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 01/03] ARM: shmobile: Remove mach/system.h
2015-01-20 11:57 [PATCH 00/03] ARM: shmobile: Minor header cleanup Magnus Damm
@ 2015-01-20 11:58 ` Magnus Damm
2015-01-20 11:58 ` [PATCH 02/03] ARM: shmobile: Remove mach/clkdev.h Magnus Damm
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Magnus Damm @ 2015-01-20 11:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
The file <mach/system.h> is no longer included from anywhere so
clean up the code by removing mach-shmobile/include/mach/system.h
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
Applies to renesas-devel-20150119-v3.19-rc5
arch/arm/mach-shmobile/include/mach/system.h | 11 -----------
1 file changed, 11 deletions(-)
--- 0001/arch/arm/mach-shmobile/include/mach/system.h
+++ /dev/null 2015-01-13 15:44:39.280208949 +0900
@@ -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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 02/03] ARM: shmobile: Remove mach/clkdev.h
2015-01-20 11:57 [PATCH 00/03] ARM: shmobile: Minor header cleanup Magnus Damm
2015-01-20 11:58 ` [PATCH 01/03] ARM: shmobile: Remove mach/system.h Magnus Damm
@ 2015-01-20 11:58 ` Magnus Damm
2015-01-20 11:58 ` [PATCH 03/03] ARM: shmobile: Remove mach/uncompress.h Magnus Damm
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Magnus Damm @ 2015-01-20 11:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
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.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
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(-)
--- 0001/arch/arm/Kconfig
+++ work/arch/arm/Kconfig 2015-01-20 20:27:11.307765682 +0900
@@ -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
--- 0001/arch/arm/mach-shmobile/clock.c
+++ work/arch/arm/mach-shmobile/clock.c 2015-01-20 20:27:11.307765682 +0900
@@ -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);
--- 0001/arch/arm/mach-shmobile/include/mach/clkdev.h
+++ /dev/null 2015-01-13 15:44:39.280208949 +0900
@@ -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 */
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 03/03] ARM: shmobile: Remove mach/uncompress.h
2015-01-20 11:57 [PATCH 00/03] ARM: shmobile: Minor header cleanup Magnus Damm
2015-01-20 11:58 ` [PATCH 01/03] ARM: shmobile: Remove mach/system.h Magnus Damm
2015-01-20 11:58 ` [PATCH 02/03] ARM: shmobile: Remove mach/clkdev.h Magnus Damm
@ 2015-01-20 11:58 ` Magnus Damm
2015-01-20 12:43 ` [PATCH 00/03] ARM: shmobile: Minor header cleanup Laurent Pinchart
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Magnus Damm @ 2015-01-20 11:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Convert ARCH_SHMOBILE_LEGACY to make use of <debug/uncompress.h>
and remove the now unused <mach/uncompress.h>.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
arch/arm/Kconfig.debug | 3 ++-
arch/arm/mach-shmobile/include/mach/uncompress.h | 19 -------------------
2 files changed, 2 insertions(+), 20 deletions(-)
--- 0001/arch/arm/Kconfig.debug
+++ work/arch/arm/Kconfig.debug 2015-01-20 20:26:10.527765900 +0900
@@ -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
--- 0001/arch/arm/mach-shmobile/include/mach/uncompress.h
+++ /dev/null 2015-01-13 15:44:39.280208949 +0900
@@ -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 */
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 00/03] ARM: shmobile: Minor header cleanup
2015-01-20 11:57 [PATCH 00/03] ARM: shmobile: Minor header cleanup Magnus Damm
` (2 preceding siblings ...)
2015-01-20 11:58 ` [PATCH 03/03] ARM: shmobile: Remove mach/uncompress.h Magnus Damm
@ 2015-01-20 12:43 ` Laurent Pinchart
2015-01-20 13:31 ` Geert Uytterhoeven
2015-01-21 1:59 ` Simon Horman
5 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2015-01-20 12:43 UTC (permalink / raw)
To: linux-arm-kernel
Hi Magnus,
Thank you for the patches.
On Tuesday 20 January 2015 20:57:50 Magnus Damm wrote:
> 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/
Nice, mach-shmobile is getting slimmer, I like that :-)
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
For the whole series,
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>
> 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(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 00/03] ARM: shmobile: Minor header cleanup
2015-01-20 11:57 [PATCH 00/03] ARM: shmobile: Minor header cleanup Magnus Damm
` (3 preceding siblings ...)
2015-01-20 12:43 ` [PATCH 00/03] ARM: shmobile: Minor header cleanup Laurent Pinchart
@ 2015-01-20 13:31 ` Geert Uytterhoeven
2015-01-21 1:59 ` Simon Horman
5 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2015-01-20 13:31 UTC (permalink / raw)
To: linux-arm-kernel
Hi Magnus,
On Tue, Jan 20, 2015 at 12:57 PM, Magnus Damm <magnus.damm@gmail.com> wrote:
> 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/
Thanks!
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 00/03] ARM: shmobile: Minor header cleanup
2015-01-20 11:57 [PATCH 00/03] ARM: shmobile: Minor header cleanup Magnus Damm
` (4 preceding siblings ...)
2015-01-20 13:31 ` Geert Uytterhoeven
@ 2015-01-21 1:59 ` Simon Horman
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2015-01-21 1:59 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 20, 2015 at 08:57:50PM +0900, Magnus Damm wrote:
> 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/
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Thanks, I have queued this up for v3.21 with Laurent and Geert's Acks.
> ---
>
> 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(-)
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-01-21 1:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-20 11:57 [PATCH 00/03] ARM: shmobile: Minor header cleanup Magnus Damm
2015-01-20 11:58 ` [PATCH 01/03] ARM: shmobile: Remove mach/system.h Magnus Damm
2015-01-20 11:58 ` [PATCH 02/03] ARM: shmobile: Remove mach/clkdev.h Magnus Damm
2015-01-20 11:58 ` [PATCH 03/03] ARM: shmobile: Remove mach/uncompress.h Magnus Damm
2015-01-20 12:43 ` [PATCH 00/03] ARM: shmobile: Minor header cleanup Laurent Pinchart
2015-01-20 13:31 ` Geert Uytterhoeven
2015-01-21 1:59 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).