system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-19 18:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which

Browse source 
are unused on ARM architecure.  Samsung has some code setting up wdog
 in arch_decomp_wdog().  But since CONFIG_S3C_BOOT_WATCHDOG is defined
 nowhere, it will not run.  Otherwise, system can not boot at all when
 wdog is set up but no one pats it.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJQ9WSiAAoJEFBXWFqHsHzOkpYH/iHOomqWknjg0YjeUKmoqnk+
 UnAiP/OD0pOuqdC3izSq5rAaxeCn2ESYhXWdHH3LQFNnhwDPOItagY3T1dBgJH0G
 KvO3wDj0K1jUM6Nzt4hta4pnCc/KClyCcVjYrP5pE+bs3NzOzxvfj2tPc81lI0Iy
 rnkMLWw6gVRllhecUezt3TOd/GfI7NwuyjjBOLelOerbImWFqLOCNIZSRQlazbyS
 hFh4OkR7yoU6vEvPdmS4B4A5PWBHlxiUS6Wr4v+doGFPiFgR05tJodLnnJ/KGWmG
 LFY99MyeBvcgiUlFcUpiVLYpWJh+7IB1LJH+IGNJbWFYC+Yvn/o9IRYO8kvuiYE=
 =weNJ
 -----END PGP SIGNATURE-----

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

From Shawn Guo:
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
are unused on ARM architecure.  Samsung has some code setting up wdog
in arch_decomp_wdog().  But since CONFIG_S3C_BOOT_WATCHDOG is defined
nowhere, it will not run.  Otherwise, system can not boot at all when
wdog is set up but no one pats it.

* tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: samsung: remove unused arch_decomp_wdog() code
  ARM: remove unused arch_decomp_wdog()
  ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-02-05 10:26:06 -08:00
parent 0a046de1d1 1ff5f55a8c
commit b28eaacfbb
45 changed files with 0 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/compressed/decompress.c
View file

@ -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);}

2
arch/arm/mach-at91/include/mach/uncompress.h
View file

@ -196,6 +196,4 @@ static inline void flush(void)
barrier();
}
#define arch_decomp_wdog()
#endif

1
arch/arm/mach-bcm2835/include/mach/uncompress.h
View file

@ -42,4 +42,3 @@ static inline void flush(void)
}
#define arch_decomp_setup()
#define arch_decomp_wdog()

2
arch/arm/mach-clps711x/include/mach/uncompress.h
View file

@ -53,5 +53,3 @@ static inline void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

1
arch/arm/mach-cns3xxx/include/mach/uncompress.h
View file

@ -51,4 +51,3 @@ static inline void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

1
arch/arm/mach-davinci/include/mach/uncompress.h
View file

@ -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()

1
arch/arm/mach-dove/include/mach/uncompress.h
View file

@ -34,4 +34,3 @@ static void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

1
arch/arm/mach-ebsa110/include/mach/uncompress.h
View file

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

2
arch/arm/mach-ep93xx/include/mach/uncompress.h
View file

@ -86,5 +86,3 @@ static void arch_decomp_setup(void)
{
ethernet_reset();
}
#define arch_decomp_wdog()

1
arch/arm/mach-footbridge/include/mach/uncompress.h
View file

@ -35,4 +35,3 @@ static inline void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

2
arch/arm/mach-gemini/include/mach/uncompress.h
View file

@ -39,6 +39,4 @@ static inline void flush(void)
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()
#endif /* __MACH_UNCOMPRESS_H */

1
arch/arm/mach-h720x/include/mach/uncompress.h
View file

@ -32,6 +32,5 @@ static inline void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()
#endif

2
arch/arm/mach-integrator/include/mach/uncompress.h
View file

@ -46,5 +46,3 @@ static inline void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

1
arch/arm/mach-iop13xx/include/mach/uncompress.h
View file

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

1
arch/arm/mach-iop32x/include/mach/uncompress.h
View file

@ -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()

1
arch/arm/mach-iop33x/include/mach/uncompress.h
View file

@ -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()

2
arch/arm/mach-ixp4xx/include/mach/uncompress.h
View file

@ -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

1
arch/arm/mach-kirkwood/include/mach/uncompress.h
View file

@ -44,4 +44,3 @@ static void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

1
arch/arm/mach-ks8695/include/mach/uncompress.h
View file

@ -32,6 +32,5 @@ static inline void flush(void)
}
#define arch_decomp_setup()
#define arch_decomp_wdog()
#endif

1
arch/arm/mach-lpc32xx/include/mach/uncompress.h
View file

@ -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

6
arch/arm/mach-mmp/include/mach/uncompress.h
View file

@ -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()

4
arch/arm/mach-msm/include/mach/uncompress.h
View file

@ -60,8 +60,4 @@ static inline void arch_decomp_setup(void)
{
}
static inline void arch_decomp_wdog(void)
{
}
#endif

1
arch/arm/mach-mv78xx0/include/mach/uncompress.h
View file

@ -44,4 +44,3 @@ static void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

1
arch/arm/mach-mxs/include/mach/uncompress.h
View file

@ -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__ */

1
arch/arm/mach-netx/include/mach/uncompress.h
View file

@ -73,4 +73,3 @@ static inline void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

2
arch/arm/mach-nomadik/include/mach/uncompress.h
View file

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

5
arch/arm/mach-omap1/include/mach/uncompress.h
View file

@ -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()

5
arch/arm/mach-omap2/include/mach/uncompress.h
View file

@ -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()

1
arch/arm/mach-orion5x/include/mach/uncompress.h
View file

@ -46,4 +46,3 @@ static void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

2
arch/arm/mach-prima2/include/mach/uncompress.h
View file

@ -17,8 +17,6 @@ void arch_decomp_setup(void)
{
}
#define arch_decomp_wdog()
static __inline__ void putc(char c)
{
/*

5
arch/arm/mach-pxa/include/mach/uncompress.h
View file

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

1
arch/arm/mach-realview/include/mach/uncompress.h
View file

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

5
arch/arm/mach-rpc/include/mach/uncompress.h
View file

@ -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()

28
arch/arm/mach-s5p64x0/include/mach/uncompress.h
View file

@ -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

1
arch/arm/mach-sa1100/include/mach/uncompress.h
View file

@ -49,4 +49,3 @@ static inline void flush(void)
* Nothing to do for these
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

1
arch/arm/mach-shark/include/mach/uncompress.h
View file

@ -48,4 +48,3 @@ static void putr()
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

2
arch/arm/mach-shmobile/include/mach/uncompress.h
View file

@ -16,6 +16,4 @@ static void arch_decomp_setup(void)
{
}
#define arch_decomp_wdog()
#endif /* __ASM_MACH_UNCOMPRESS_H */

4
arch/arm/mach-tegra/include/mach/uncompress.h
View file

@ -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

1
arch/arm/mach-u300/include/mach/uncompress.h
View file

@ -43,4 +43,3 @@ static inline void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

2
arch/arm/mach-ux500/include/mach/uncompress.h
View file

@ -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 */

1
arch/arm/mach-versatile/include/mach/uncompress.h
View file

@ -43,4 +43,3 @@ static inline void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

1
arch/arm/mach-vt8500/include/mach/uncompress.h
View file

@ -34,4 +34,3 @@ static void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()

2
arch/arm/mach-w90x900/include/mach/uncompress.h
View file

@ -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;

28
arch/arm/plat-samsung/include/plat/uncompress.h
View file

@ -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.

1
arch/arm/plat-spear/include/plat/uncompress.h
View file

@ -38,6 +38,5 @@ static inline void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
#define arch_decomp_wdog()
#endif /* __PLAT_UNCOMPRESS_H */