arch_decomp_wdog cleanup

PATCH New Shawn Guo 6 participants 14 messages Jan 10, 2013 – Jan 11, 2013

Subsystems (25)

Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape Arm Samsung Exynos +21 more subsystems

lore

Share & tools

lore

Shawn Guo

author

2013-01-10 14:12 UTC #0 lore raw

cover arch_decomp_wdog cleanup

All the arch_decomp_wdog related codes are there without any users, since ARCH_HAS_DECOMP_WDOG is only used by lib/inflate.c which however is not used by arch/arm/boot/compressed/decompress.c.

Shawn Guo (3):
ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG
ARM: remove unused arch_decomp_wdog()
ARM: samsung: remove unused arch_decomp_wdog() code

 arch/arm/boot/compressed/decompress.c              |    2 --
 arch/arm/mach-at91/include/mach/uncompress.h       |    2 --
 arch/arm/mach-bcm2835/include/mach/uncompress.h    |    1 -
 arch/arm/mach-clps711x/include/mach/uncompress.h   |    2 --
 arch/arm/mach-cns3xxx/include/mach/uncompress.h    |    1 -
 arch/arm/mach-davinci/include/mach/uncompress.h    |    1 -
 arch/arm/mach-dove/include/mach/uncompress.h       |    1 -
 arch/arm/mach-ebsa110/include/mach/uncompress.h    |    1 -
 arch/arm/mach-ep93xx/include/mach/uncompress.h     |    2 --
 arch/arm/mach-footbridge/include/mach/uncompress.h |    1 -
 arch/arm/mach-gemini/include/mach/uncompress.h     |    2 --
 arch/arm/mach-h720x/include/mach/uncompress.h      |    1 -
 arch/arm/mach-integrator/include/mach/uncompress.h |    2 --
 arch/arm/mach-iop13xx/include/mach/uncompress.h    |    1 -
 arch/arm/mach-iop32x/include/mach/uncompress.h     |    1 -
 arch/arm/mach-iop33x/include/mach/uncompress.h     |    1 -
 arch/arm/mach-ixp4xx/include/mach/uncompress.h     |    2 --
 arch/arm/mach-kirkwood/include/mach/uncompress.h   |    1 -
 arch/arm/mach-ks8695/include/mach/uncompress.h     |    1 -
 arch/arm/mach-lpc32xx/include/mach/uncompress.h    |    1 -
 arch/arm/mach-mmp/include/mach/uncompress.h        |    6 -----
 arch/arm/mach-msm/include/mach/uncompress.h        |    4 ---
 arch/arm/mach-mv78xx0/include/mach/uncompress.h    |    1 -
 arch/arm/mach-mxs/include/mach/uncompress.h        |    1 -
 arch/arm/mach-netx/include/mach/uncompress.h       |    1 -
 arch/arm/mach-nomadik/include/mach/uncompress.h    |    2 --
 arch/arm/mach-omap1/include/mach/uncompress.h      |    5 ----
 arch/arm/mach-omap2/include/mach/uncompress.h      |    5 ----
 arch/arm/mach-orion5x/include/mach/uncompress.h    |    1 -
 arch/arm/mach-prima2/include/mach/uncompress.h     |    2 --
 arch/arm/mach-pxa/include/mach/uncompress.h        |    5 ----
 arch/arm/mach-realview/include/mach/uncompress.h   |    1 -
 arch/arm/mach-rpc/include/mach/uncompress.h        |    5 ----
 arch/arm/mach-s5p64x0/include/mach/uncompress.h    |   28 --------------------
 arch/arm/mach-sa1100/include/mach/uncompress.h     |    1 -
 arch/arm/mach-shark/include/mach/uncompress.h      |    1 -
 arch/arm/mach-shmobile/include/mach/uncompress.h   |    2 --
 arch/arm/mach-tegra/include/mach/uncompress.h      |    4 ---
 arch/arm/mach-u300/include/mach/uncompress.h       |    1 -
 arch/arm/mach-ux500/include/mach/uncompress.h      |    2 --
 arch/arm/mach-versatile/include/mach/uncompress.h  |    1 -
 arch/arm/mach-vt8500/include/mach/uncompress.h     |    1 -
 arch/arm/mach-w90x900/include/mach/uncompress.h    |    2 --
 arch/arm/plat-samsung/include/plat/uncompress.h    |   28 --------------------
 arch/arm/plat-spear/include/plat/uncompress.h      |    1 -
 45 files changed, 138 deletions(-)

Signature · 1 line

1.7.9.5

Shawn Guo

author

2013-01-10 14:12 UTC #1 lore raw

PATCH 1/3 ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG

ARCH_HAS_DECOMP_WDOG is only used in lib/inflate.c which is not included in arch/arm/boot/compressed/decompress.c now. That said, ARCH_HAS_DECOMP_WDOG is not used at all. Let's remove it.

Signed-off-by Shawn Guo <[email protected]>

---
 arch/arm/boot/compressed/decompress.c |    2 --
 1 file changed, 2 deletions(-)

arch/arm/boot/compressed/decompress.c +0 -2

index 9deb56a..24b0475 100644
@@ -13,8 +13,6 @@ extern void error(char *);
 #define STATIC static
 #define STATIC_RW_DATA	/* non-static please */
 
-#define ARCH_HAS_DECOMP_WDOG
-
 /* Diagnostic functions */
 #ifdef DEBUG
 #  define Assert(cond,msg) {if(!(cond)) error(msg);}

Signature · 1 line

1.7.9.5

Shawn Guo

author

2013-01-10 14:12 UTC #2 lore raw

PATCH 2/3 ARM: remove unused arch_decomp_wdog()

In reply to Shawn Guo

With ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c, all the arch_decomp_wdog() definition at platform level is unneeded. Remmove it.

Signed-off-by Shawn Guo <[email protected]>

---
 arch/arm/mach-at91/include/mach/uncompress.h       |    2 --
 arch/arm/mach-bcm2835/include/mach/uncompress.h    |    1 -
 arch/arm/mach-clps711x/include/mach/uncompress.h   |    2 --
 arch/arm/mach-cns3xxx/include/mach/uncompress.h    |    1 -
 arch/arm/mach-davinci/include/mach/uncompress.h    |    1 -
 arch/arm/mach-dove/include/mach/uncompress.h       |    1 -
 arch/arm/mach-ebsa110/include/mach/uncompress.h    |    1 -
 arch/arm/mach-ep93xx/include/mach/uncompress.h     |    2 --
 arch/arm/mach-footbridge/include/mach/uncompress.h |    1 -
 arch/arm/mach-gemini/include/mach/uncompress.h     |    2 --
 arch/arm/mach-h720x/include/mach/uncompress.h      |    1 -
 arch/arm/mach-integrator/include/mach/uncompress.h |    2 --
 arch/arm/mach-iop13xx/include/mach/uncompress.h    |    1 -
 arch/arm/mach-iop32x/include/mach/uncompress.h     |    1 -
 arch/arm/mach-iop33x/include/mach/uncompress.h     |    1 -
 arch/arm/mach-ixp4xx/include/mach/uncompress.h     |    2 --
 arch/arm/mach-kirkwood/include/mach/uncompress.h   |    1 -
 arch/arm/mach-ks8695/include/mach/uncompress.h     |    1 -
 arch/arm/mach-lpc32xx/include/mach/uncompress.h    |    1 -
 arch/arm/mach-mmp/include/mach/uncompress.h        |    6 ------
 arch/arm/mach-msm/include/mach/uncompress.h        |    4 ----
 arch/arm/mach-mv78xx0/include/mach/uncompress.h    |    1 -
 arch/arm/mach-mxs/include/mach/uncompress.h        |    1 -
 arch/arm/mach-netx/include/mach/uncompress.h       |    1 -
 arch/arm/mach-nomadik/include/mach/uncompress.h    |    2 --
 arch/arm/mach-omap1/include/mach/uncompress.h      |    5 -----
 arch/arm/mach-omap2/include/mach/uncompress.h      |    5 -----
 arch/arm/mach-orion5x/include/mach/uncompress.h    |    1 -
 arch/arm/mach-prima2/include/mach/uncompress.h     |    2 --
 arch/arm/mach-pxa/include/mach/uncompress.h        |    5 -----
 arch/arm/mach-realview/include/mach/uncompress.h   |    1 -
 arch/arm/mach-rpc/include/mach/uncompress.h        |    5 -----
 arch/arm/mach-sa1100/include/mach/uncompress.h     |    1 -
 arch/arm/mach-shark/include/mach/uncompress.h      |    1 -
 arch/arm/mach-shmobile/include/mach/uncompress.h   |    2 --
 arch/arm/mach-tegra/include/mach/uncompress.h      |    4 ----
 arch/arm/mach-u300/include/mach/uncompress.h       |    1 -
 arch/arm/mach-ux500/include/mach/uncompress.h      |    2 --
 arch/arm/mach-versatile/include/mach/uncompress.h  |    1 -
 arch/arm/mach-vt8500/include/mach/uncompress.h     |    1 -
 arch/arm/mach-w90x900/include/mach/uncompress.h    |    2 --
 arch/arm/plat-spear/include/plat/uncompress.h      |    1 -
 42 files changed, 80 deletions(-)

arch/arm/mach-at91/include/mach/uncompress.h +0 -2

index 97ad68a..5659f7c 100644
@@ -196,6 +196,4 @@ static inline void flush(void)
 		barrier();
 }
 
-#define arch_decomp_wdog()
-
 #endif

arch/arm/mach-bcm2835/include/mach/uncompress.h +0 -1

index cc46dcc..bf86dca 100644
@@ -42,4 +42,3 @@ static inline void flush(void)
 }
 
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-clps711x/include/mach/uncompress.h +0 -2

index 7b28d6a..5f02d06 100644
@@ -53,5 +53,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-
-#define arch_decomp_wdog()

arch/arm/mach-cns3xxx/include/mach/uncompress.h +0 -1

index a91b605..7a030b9 100644
@@ -51,4 +51,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-davinci/include/mach/uncompress.h +0 -1

index 3a0ff90..f49c2916 100644
@@ -101,4 +101,3 @@ static inline void __arch_decomp_setup(unsigned long arch_id)
 }
 
 #define arch_decomp_setup()	__arch_decomp_setup(arch_id)
-#define arch_decomp_wdog()

arch/arm/mach-dove/include/mach/uncompress.h +0 -1

index 2c5cdd7..5c8ae9b 100644
@@ -34,4 +34,3 @@ static void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-ebsa110/include/mach/uncompress.h +0 -1

index 3204150..ab64bea 100644
@@ -42,4 +42,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-ep93xx/include/mach/uncompress.h +0 -2

index d64274f..d2afb4d 100644
@@ -86,5 +86,3 @@ static void arch_decomp_setup(void)
 {
 	ethernet_reset();
 }
-
-#define arch_decomp_wdog()

arch/arm/mach-footbridge/include/mach/uncompress.h +0 -1

index 5dfa442..a69398c 100644
@@ -35,4 +35,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-gemini/include/mach/uncompress.h +0 -2

index 0efa262..02e2256 100644
@@ -39,6 +39,4 @@ static inline void flush(void)
  */
 #define arch_decomp_setup()
 
-#define arch_decomp_wdog()
-
 #endif /* __MACH_UNCOMPRESS_H */

arch/arm/mach-h720x/include/mach/uncompress.h +0 -1

index d662323..43e343c 100644
@@ -32,6 +32,5 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()
 
 #endif

arch/arm/mach-integrator/include/mach/uncompress.h +0 -2

index 30452f0..8f3cc99 100644
@@ -46,5 +46,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-
-#define arch_decomp_wdog()

arch/arm/mach-iop13xx/include/mach/uncompress.h +0 -1

index fa4f805..d3791ec 100644
@@ -20,4 +20,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-iop32x/include/mach/uncompress.h +0 -1

index 4fd7154..b3d45fd 100644
@@ -36,4 +36,3 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
  * nothing to do
  */
 #define arch_decomp_setup()	__arch_decomp_setup(arch_id)
-#define arch_decomp_wdog()

arch/arm/mach-iop33x/include/mach/uncompress.h +0 -1

index f99bb84..ed282e1 100644
@@ -34,4 +34,3 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
  * nothing to do
  */
 #define arch_decomp_setup()	__arch_decomp_setup(arch_id)
-#define arch_decomp_wdog()

arch/arm/mach-ixp4xx/include/mach/uncompress.h +0 -2

index eb945a9..7b25c02 100644
@@ -53,6 +53,4 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
  */
 #define arch_decomp_setup()	__arch_decomp_setup(arch_id)
 
-#define arch_decomp_wdog()
-
 #endif

arch/arm/mach-kirkwood/include/mach/uncompress.h +0 -1

index 75d5497..5bca553 100644
@@ -44,4 +44,3 @@ static void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-ks8695/include/mach/uncompress.h +0 -1

index 8879d61..c089a1a 100644
@@ -32,6 +32,5 @@ static inline void flush(void)
 }
 
 #define arch_decomp_setup()
-#define arch_decomp_wdog()
 
 #endif

arch/arm/mach-lpc32xx/include/mach/uncompress.h +0 -1

index c142487..1198a89 100644
@@ -55,6 +55,5 @@ static inline void flush(void)
 
 /* NULL functions; we don't presently need them */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()
 
 #endif

arch/arm/mach-mmp/include/mach/uncompress.h +0 -6

index d6daeb7..8890fa8 100644
@@ -43,9 +43,3 @@ static inline void arch_decomp_setup(void)
 	if (machine_is_avengers_lite())
 		UART = (unsigned long *)UART3_BASE;
 }
-
-/*
- * nothing to do
- */
-
-#define arch_decomp_wdog()

arch/arm/mach-msm/include/mach/uncompress.h +0 -4

index c14011f..fa97a10 100644
@@ -60,8 +60,4 @@ static inline void arch_decomp_setup(void)
 {
 }
 
-static inline void arch_decomp_wdog(void)
-{
-}
-
 #endif

arch/arm/mach-mv78xx0/include/mach/uncompress.h +0 -1

index 3652642..6a761c4 100644
@@ -44,4 +44,3 @@ static void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-mxs/include/mach/uncompress.h +0 -1

index ef28114..533f518 100644
@@ -72,6 +72,5 @@ static inline void __arch_decomp_setup(unsigned long arch_id)
 }
 
 #define arch_decomp_setup()	__arch_decomp_setup(arch_id)
-#define arch_decomp_wdog()
 
 #endif /* __MACH_MXS_UNCOMPRESS_H__ */

arch/arm/mach-netx/include/mach/uncompress.h +0 -1

index 84f9128..5cb1051 100644
@@ -73,4 +73,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-nomadik/include/mach/uncompress.h +0 -2

index 7d4687e..f527af6 100644
@@ -58,6 +58,4 @@ static inline void arch_decomp_setup(void)
 {
 }
 
-#define arch_decomp_wdog() /* nothing to do here */
-
 #endif /* __ASM_ARCH_UNCOMPRESS_H */

arch/arm/mach-omap1/include/mach/uncompress.h +0 -5

index ad6fbe7..4869633 100644
@@ -115,8 +115,3 @@ static inline void arch_decomp_setup(void)
 		DEBUG_LL_OMAP1(3, sx1);
 	} while (0);
 }
-
-/*
- * nothing to do
- */
-#define arch_decomp_wdog()

arch/arm/mach-omap2/include/mach/uncompress.h +0 -5

index 8e3546d..7b360ac 100644
@@ -169,8 +169,3 @@ static inline void arch_decomp_setup(void)
 		DEBUG_LL_AM33XX(1, am335xevm);
 	} while (0);
 }
-
-/*
- * nothing to do
- */
-#define arch_decomp_wdog()

arch/arm/mach-orion5x/include/mach/uncompress.h +0 -1

index 4322dba..abd26b5 100644
@@ -46,4 +46,3 @@ static void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-prima2/include/mach/uncompress.h +0 -2

index 0c898fc..f72ca26 100644
@@ -17,8 +17,6 @@ void arch_decomp_setup(void)
 {
 }
 
-#define arch_decomp_wdog()
-
 static __inline__ void putc(char c)
 {
 	/*

arch/arm/mach-pxa/include/mach/uncompress.h +0 -5

index 5519a34..8c27757 100644
@@ -72,8 +72,3 @@ static inline void arch_decomp_setup(void)
 		uart_is_pxa = 0;
 	}
 }
-
-/*
- * nothing to do
- */
-#define arch_decomp_wdog()

arch/arm/mach-realview/include/mach/uncompress.h +0 -1

index 83050378..cfa30d2 100644
@@ -75,4 +75,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-rpc/include/mach/uncompress.h +0 -5

index 9cd9bcd..0fd4b0b 100644
@@ -189,8 +189,3 @@ static void arch_decomp_setup(void)
 	if (nr_pages * page_size < 4096*1024) error("<4M of mem\n");
 }
 #endif
-
-/*
- * nothing to do
- */
-#define arch_decomp_wdog()

arch/arm/mach-sa1100/include/mach/uncompress.h +0 -1

index 5cf71da..73093dc 100644
@@ -49,4 +49,3 @@ static inline void flush(void)
  * Nothing to do for these
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-shark/include/mach/uncompress.h +0 -1

index 22ccab4..a168435 100644
@@ -48,4 +48,3 @@ static void putr()
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-shmobile/include/mach/uncompress.h +0 -2

index 0bd7556..f1aee56 100644
@@ -16,6 +16,4 @@ static void arch_decomp_setup(void)
 {
 }
 
-#define arch_decomp_wdog()
-
 #endif /* __ASM_MACH_UNCOMPRESS_H */

arch/arm/mach-tegra/include/mach/uncompress.h +0 -4

index 485003f..0838641 100644
@@ -172,8 +172,4 @@ static inline void arch_decomp_setup(void)
 	uart[UART_LCR << DEBUG_UART_SHIFT] = 3;
 }
 
-static inline void arch_decomp_wdog(void)
-{
-}
-
 #endif

arch/arm/mach-u300/include/mach/uncompress.h +0 -1

index 29acb71..783e7e6 100644
@@ -43,4 +43,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-ux500/include/mach/uncompress.h +0 -2

index d60ecd1..36969d5 100644
@@ -54,6 +54,4 @@ static inline void arch_decomp_setup(void)
 	ux500_uart_base = (void __iomem *)U8500_UART2_BASE;
 }
 
-#define arch_decomp_wdog() /* nothing to do here */
-
 #endif /* __ASM_ARCH_UNCOMPRESS_H */

arch/arm/mach-versatile/include/mach/uncompress.h +0 -1

index 3dd0048..986e3d3 100644
@@ -43,4 +43,3 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-vt8500/include/mach/uncompress.h +0 -1

index e6e81fd..5b4f19e 100644
@@ -34,4 +34,3 @@ static void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()

arch/arm/mach-w90x900/include/mach/uncompress.h +0 -2

index 0313021..4b7c324 100644
@@ -24,8 +24,6 @@
 #include <mach/map.h>
 #include <linux/serial_reg.h>
 
-#define arch_decomp_wdog()
-
 #define TX_DONE	(UART_LSR_TEMT | UART_LSR_THRE)
 static volatile u32 * const uart_base = (u32 *)UART0_PA;

arch/arm/plat-spear/include/plat/uncompress.h +0 -1

index 2ce6cb1..51b2dc9 100644
@@ -38,6 +38,5 @@ static inline void flush(void)
  * nothing to do
  */
 #define arch_decomp_setup()
-#define arch_decomp_wdog()
 
 #endif /* __PLAT_UNCOMPRESS_H */

Signature · 1 line

1.7.9.5

Jason Cooper

2013-01-10 14:40 UTC #3 lore raw

PATCH 2/3 ARM: remove unused arch_decomp_wdog()

Quoted 10 lines · Shawn Guo

With ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c, all the arch_decomp_wdog() definition at platform level is unneeded. Remmove it.
Signed-off-by Shawn Guo <[email protected]>
---
 arch/arm/mach-dove/include/mach/uncompress.h       |    1 -
 arch/arm/mach-kirkwood/include/mach/uncompress.h   |    1 -
 arch/arm/mach-mv78xx0/include/mach/uncompress.h    |    1 -
 arch/arm/mach-orion5x/include/mach/uncompress.h    |    1 -

Acked-by Jason Cooper <[email protected]>

thx,

Jason.

Shawn Guo

author

2013-01-10 14:12 UTC #4 lore raw

PATCH 3/3 ARM: samsung: remove unused arch_decomp_wdog() code

In reply to Shawn Guo

With ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c, all the arch_decomp_wdog() related codes become unused. Remove them.

Signed-off-by Shawn Guo <[email protected]>

Cc Kukjin Kim <[email protected]>

---
 arch/arm/mach-s5p64x0/include/mach/uncompress.h |   28 -----------------------
 arch/arm/plat-samsung/include/plat/uncompress.h |   28 -----------------------
 2 files changed, 56 deletions(-)

arch/arm/mach-s5p64x0/include/mach/uncompress.h +0 ~~-28~~

index 1608faf..19e0d64 100644
@@ -116,33 +116,6 @@ static inline void flush(void)
 		*((volatile unsigned int __force *)(ad)) = (d); \
 	} while (0)
 
-/*
- * CONFIG_S3C_BOOT_WATCHDOG
- *
- * Simple boot-time watchdog setup, to reboot the system if there is
- * any problem with the boot process
- */
-
-#ifdef CONFIG_S3C_BOOT_WATCHDOG
-
-#define WDOG_COUNT (0xff00)
-
-static inline void arch_decomp_wdog(void)
-{
-	__raw_writel(WDOG_COUNT, S3C2410_WTCNT);
-}
-
-static void arch_decomp_wdog_start(void)
-{
-	__raw_writel(WDOG_COUNT, S3C2410_WTDAT);
-	__raw_writel(WDOG_COUNT, S3C2410_WTCNT);
-	__raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x80), S3C2410_WTCON);
-}
-
-#else
-#define arch_decomp_wdog_start()
-#define arch_decomp_wdog()
-#endif
 
 #ifdef CONFIG_S3C_BOOT_ERROR_RESET

@@ -192,7 +165,6 @@ static void arch_decomp_setup(void)
 	 */
 
 	arch_detect_cpu();
-	arch_decomp_wdog_start();
 
 	/*
 	 * Enable the UART FIFOs if they where not enabled and our

arch/arm/plat-samsung/include/plat/uncompress.h +0 ~~-28~~

index 7e068d1..438b248 100644
@@ -97,33 +97,6 @@ static inline void flush(void)
 		*((volatile unsigned int __force *)(ad)) = (d); \
 	} while (0)
 
-/* CONFIG_S3C_BOOT_WATCHDOG
- *
- * Simple boot-time watchdog setup, to reboot the system if there is
- * any problem with the boot process
-*/
-
-#ifdef CONFIG_S3C_BOOT_WATCHDOG
-
-#define WDOG_COUNT (0xff00)
-
-static inline void arch_decomp_wdog(void)
-{
-	__raw_writel(WDOG_COUNT, S3C2410_WTCNT);
-}
-
-static void arch_decomp_wdog_start(void)
-{
-	__raw_writel(WDOG_COUNT, S3C2410_WTDAT);
-	__raw_writel(WDOG_COUNT, S3C2410_WTCNT);
-	__raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x80), S3C2410_WTCON);
-}
-
-#else
-#define arch_decomp_wdog_start()
-#define arch_decomp_wdog()
-#endif
-
 #ifdef CONFIG_S3C_BOOT_ERROR_RESET
 
 static void arch_decomp_error(const char *x)

@@ -173,7 +146,6 @@ arch_decomp_setup(void)
 	 */
 
 	arch_detect_cpu();
-	arch_decomp_wdog_start();
 
 	/* Enable the UART FIFOs if they where not enabled and our
 	 * configuration says we should turn them on.

Signature · 1 line

1.7.9.5

Kukjin Kim

2013-01-11 05:51 UTC #5 lore raw

PATCH 3/3 ARM: samsung: remove unused arch_decomp_wdog() code

Quoted 7 lines · Shawn Guo

With ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c,
all the arch_decomp_wdog() related codes become unused. Remove them.
Signed-off-by Shawn Guo <[email protected]>
Cc Kukjin Kim <[email protected]>

Looks good to me,

Acked-by Kukjin Kim <[email protected]>

Do you want me to take this into Samsung tree?

- Kukjin

Shawn Guo

author

2013-01-11 05:54 UTC #6 lore raw

PATCH 3/3 ARM: samsung: remove unused arch_decomp_wdog() code

Quoted 6 lines · Kukjin Kim

Quoted 5 lines · Shawn Guo
With ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c,
all the arch_decomp_wdog() related codes become unused. Remove them.

Quoted 6 lines

Quoted 2 lines
Signed-off-by Shawn Guo <[email protected]>
Cc Kukjin Kim <[email protected]>
Looks good to me,
Acked-by Kukjin Kim <[email protected]>

Thanks, Kim.

Quoted 2 lines

Do you want me to take this into Samsung tree?

I would like to send them as a series to arm-soc.

Shawn

Nicolas Pitre

2013-01-10 19:32 UTC #7 lore raw

cover arch_decomp_wdog cleanup

In reply to Shawn Guo

Quoted 3 lines · Shawn Guo

All the arch_decomp_wdog related codes are there without any users, since ARCH_HAS_DECOMP_WDOG is only used by lib/inflate.c which however is not used by arch/arm/boot/compressed/decompress.c.

It is also worth mentioning that CONFIG_S3C_BOOT_WATCHDOG is not set anywhere.

For those 3 patches:

Acked-by Nicolas Pitre <[email protected]>

Nicolas

Shawn Guo

author

2013-01-11 02:53 UTC #8 lore raw

cover arch_decomp_wdog cleanup

Quoted 9 lines · Nicolas Pitre

Quoted 3 lines · Shawn Guo
All the arch_decomp_wdog related codes are there without any users, since ARCH_HAS_DECOMP_WDOG is only used by lib/inflate.c which however is not used by arch/arm/boot/compressed/decompress.c.
It is also worth mentioning that CONFIG_S3C_BOOT_WATCHDOG is not set anywhere.

Yeah, the commit log of patch #3 now looks like:

Besides the fact that CONFIG_S3C_BOOT_WATCHDOG is defined nowhere, with ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c, all the arch_decomp_wdog() related codes are not unused. Remove them.

Quoted 4 lines

For those 3 patches:
Acked-by Nicolas Pitre <[email protected]>

Thanks, Nico.

Shawn

Nicolas Pitre

2013-01-11 03:25 UTC #9 lore raw

cover arch_decomp_wdog cleanup

Quoted 7 lines · Shawn Guo

Quoted 6 lines · Nicolas Pitre
Quoted 3 lines · Shawn Guo
All the arch_decomp_wdog related codes are there without any users, since ARCH_HAS_DECOMP_WDOG is only used by lib/inflate.c which however is not used by arch/arm/boot/compressed/decompress.c.

Quoted 8 lines

Quoted 3 lines
It is also worth mentioning that CONFIG_S3C_BOOT_WATCHDOG is not set anywhere.
Yeah, the commit log of patch #3 now looks like:
Besides the fact that CONFIG_S3C_BOOT_WATCHDOG is defined nowhere, with ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c, all the arch_decomp_wdog() related codes are not unused. Remove them.

"not unused" that means "used". Probably you meant "not used" or "now unused".

Also, "all the arch_decomp_wdog() related codes are ..." doesn't look like proper english. I'd say "all the arch_decomp_wdog() related functions are .." or "all the arch_decomp_wdog() related code is ..".

Nicolas

Shawn Guo

author

2013-01-11 04:02 UTC #10 lore raw

cover arch_decomp_wdog cleanup

Quoted 7 lines · Nicolas Pitre

"not unused" that means "used". Probably you meant "not used" or "now unused".
Also, "all the arch_decomp_wdog() related codes are ..." doesn't look like proper english. I'd say "all the arch_decomp_wdog() related functions are .." or "all the arch_decomp_wdog() related code is ..".

English became the hard part of my life when I was a high school student :)

Shawn

Russell King - ARM Linux

2013-01-11 17:08 UTC #11 lore raw

cover arch_decomp_wdog cleanup

In reply to Shawn Guo

Quoted 3 lines · Shawn Guo

All the arch_decomp_wdog related codes are there without any users, since ARCH_HAS_DECOMP_WDOG is only used by lib/inflate.c which however is not used by arch/arm/boot/compressed/decompress.c.

Hmm, this suggests that those samsung platforms haven't been booted for a while - because the decompressor will enable the watchdog, but won't pat it at all. So, do we still need them in the kernel?

Other than that, this looks good. Who's going to deal with it though?

Kukjin Kim

2013-01-11 17:38 UTC #12 lore raw

cover arch_decomp_wdog cleanup

Quoted 11 lines · Russell King - ARM Linux

Quoted 2 lines · Shawn Guo
All the arch_decomp_wdog related codes are there without any users, since ARCH_HAS_DECOMP_WDOG is only used by lib/inflate.c which
however
Quoted 1 line
is not used by arch/arm/boot/compressed/decompress.c.
Hmm, this suggests that those samsung platforms haven't been booted for a while - because the decompressor will enable the watchdog, but won't pat it at all. So, do we still need them in the kernel?

Hmm, I didn't see its usage lately on relatively Samsun SoCs. But let me check again, the code is not used on every Samsung SoCs. So please hold on a couple of days, I already reply 'ack' on Samsung stuff though.

Thanks.

- Kukjin

Olof Johansson

2013-01-11 19:22 UTC #13 lore raw

cover arch_decomp_wdog cleanup

In reply to Russell King - ARM Linux

Quoted 8 lines · Russell King - ARM Linux

Quoted 3 lines · Shawn Guo
All the arch_decomp_wdog related codes are there without any users, since ARCH_HAS_DECOMP_WDOG is only used by lib/inflate.c which however is not used by arch/arm/boot/compressed/decompress.c.
Hmm, this suggests that those samsung platforms haven't been booted for a while - because the decompressor will enable the watchdog, but won't pat it at all. So, do we still need them in the kernel?

Well, they haven't been booted with the watchdog enabled at least.

Quoted 1 line

Other than that, this looks good. Who's going to deal with it though?

Given that it touches include files under mach-*/include, we might be better off taking it through arm-soc from conflicts point of view. Ok with you?

-Olof