Commit b632a30e authored by Shawn Guo's avatar Shawn Guo

ARM: remove unused arch_decomp_wdog()

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: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 07b16021
...@@ -196,6 +196,4 @@ static inline void flush(void) ...@@ -196,6 +196,4 @@ static inline void flush(void)
barrier(); barrier();
} }
#define arch_decomp_wdog()
#endif #endif
...@@ -42,4 +42,3 @@ static inline void flush(void) ...@@ -42,4 +42,3 @@ static inline void flush(void)
} }
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -53,5 +53,3 @@ static inline void flush(void) ...@@ -53,5 +53,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -51,4 +51,3 @@ static inline void flush(void) ...@@ -51,4 +51,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -101,4 +101,3 @@ static inline void __arch_decomp_setup(unsigned long arch_id) ...@@ -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_setup() __arch_decomp_setup(arch_id)
#define arch_decomp_wdog()
...@@ -34,4 +34,3 @@ static void flush(void) ...@@ -34,4 +34,3 @@ static void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -42,4 +42,3 @@ static inline void flush(void) ...@@ -42,4 +42,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -86,5 +86,3 @@ static void arch_decomp_setup(void) ...@@ -86,5 +86,3 @@ static void arch_decomp_setup(void)
{ {
ethernet_reset(); ethernet_reset();
} }
#define arch_decomp_wdog()
...@@ -35,4 +35,3 @@ static inline void flush(void) ...@@ -35,4 +35,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -39,6 +39,4 @@ static inline void flush(void) ...@@ -39,6 +39,4 @@ static inline void flush(void)
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
#endif /* __MACH_UNCOMPRESS_H */ #endif /* __MACH_UNCOMPRESS_H */
...@@ -32,6 +32,5 @@ static inline void flush(void) ...@@ -32,6 +32,5 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
#endif #endif
...@@ -46,5 +46,3 @@ static inline void flush(void) ...@@ -46,5 +46,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -20,4 +20,3 @@ static inline void flush(void) ...@@ -20,4 +20,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -36,4 +36,3 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id) ...@@ -36,4 +36,3 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() __arch_decomp_setup(arch_id) #define arch_decomp_setup() __arch_decomp_setup(arch_id)
#define arch_decomp_wdog()
...@@ -34,4 +34,3 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id) ...@@ -34,4 +34,3 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() __arch_decomp_setup(arch_id) #define arch_decomp_setup() __arch_decomp_setup(arch_id)
#define arch_decomp_wdog()
...@@ -53,6 +53,4 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id) ...@@ -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_setup() __arch_decomp_setup(arch_id)
#define arch_decomp_wdog()
#endif #endif
...@@ -44,4 +44,3 @@ static void flush(void) ...@@ -44,4 +44,3 @@ static void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -32,6 +32,5 @@ static inline void flush(void) ...@@ -32,6 +32,5 @@ static inline void flush(void)
} }
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
#endif #endif
...@@ -55,6 +55,5 @@ static inline void flush(void) ...@@ -55,6 +55,5 @@ static inline void flush(void)
/* NULL functions; we don't presently need them */ /* NULL functions; we don't presently need them */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
#endif #endif
...@@ -43,9 +43,3 @@ static inline void arch_decomp_setup(void) ...@@ -43,9 +43,3 @@ static inline void arch_decomp_setup(void)
if (machine_is_avengers_lite()) if (machine_is_avengers_lite())
UART = (unsigned long *)UART3_BASE; UART = (unsigned long *)UART3_BASE;
} }
/*
* nothing to do
*/
#define arch_decomp_wdog()
...@@ -60,8 +60,4 @@ static inline void arch_decomp_setup(void) ...@@ -60,8 +60,4 @@ static inline void arch_decomp_setup(void)
{ {
} }
static inline void arch_decomp_wdog(void)
{
}
#endif #endif
...@@ -44,4 +44,3 @@ static void flush(void) ...@@ -44,4 +44,3 @@ static void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -72,6 +72,5 @@ static inline void __arch_decomp_setup(unsigned long arch_id) ...@@ -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_setup() __arch_decomp_setup(arch_id)
#define arch_decomp_wdog()
#endif /* __MACH_MXS_UNCOMPRESS_H__ */ #endif /* __MACH_MXS_UNCOMPRESS_H__ */
...@@ -73,4 +73,3 @@ static inline void flush(void) ...@@ -73,4 +73,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -58,6 +58,4 @@ static inline void arch_decomp_setup(void) ...@@ -58,6 +58,4 @@ static inline void arch_decomp_setup(void)
{ {
} }
#define arch_decomp_wdog() /* nothing to do here */
#endif /* __ASM_ARCH_UNCOMPRESS_H */ #endif /* __ASM_ARCH_UNCOMPRESS_H */
...@@ -115,8 +115,3 @@ static inline void arch_decomp_setup(void) ...@@ -115,8 +115,3 @@ static inline void arch_decomp_setup(void)
DEBUG_LL_OMAP1(3, sx1); DEBUG_LL_OMAP1(3, sx1);
} while (0); } while (0);
} }
/*
* nothing to do
*/
#define arch_decomp_wdog()
...@@ -169,8 +169,3 @@ static inline void arch_decomp_setup(void) ...@@ -169,8 +169,3 @@ static inline void arch_decomp_setup(void)
DEBUG_LL_AM33XX(1, am335xevm); DEBUG_LL_AM33XX(1, am335xevm);
} while (0); } while (0);
} }
/*
* nothing to do
*/
#define arch_decomp_wdog()
...@@ -46,4 +46,3 @@ static void flush(void) ...@@ -46,4 +46,3 @@ static void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -17,8 +17,6 @@ void arch_decomp_setup(void) ...@@ -17,8 +17,6 @@ void arch_decomp_setup(void)
{ {
} }
#define arch_decomp_wdog()
static __inline__ void putc(char c) static __inline__ void putc(char c)
{ {
/* /*
......
...@@ -72,8 +72,3 @@ static inline void arch_decomp_setup(void) ...@@ -72,8 +72,3 @@ static inline void arch_decomp_setup(void)
uart_is_pxa = 0; uart_is_pxa = 0;
} }
} }
/*
* nothing to do
*/
#define arch_decomp_wdog()
...@@ -75,4 +75,3 @@ static inline void flush(void) ...@@ -75,4 +75,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -189,8 +189,3 @@ static void arch_decomp_setup(void) ...@@ -189,8 +189,3 @@ static void arch_decomp_setup(void)
if (nr_pages * page_size < 4096*1024) error("<4M of mem\n"); if (nr_pages * page_size < 4096*1024) error("<4M of mem\n");
} }
#endif #endif
/*
* nothing to do
*/
#define arch_decomp_wdog()
...@@ -49,4 +49,3 @@ static inline void flush(void) ...@@ -49,4 +49,3 @@ static inline void flush(void)
* Nothing to do for these * Nothing to do for these
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -48,4 +48,3 @@ static void putr() ...@@ -48,4 +48,3 @@ static void putr()
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -16,6 +16,4 @@ static void arch_decomp_setup(void) ...@@ -16,6 +16,4 @@ static void arch_decomp_setup(void)
{ {
} }
#define arch_decomp_wdog()
#endif /* __ASM_MACH_UNCOMPRESS_H */ #endif /* __ASM_MACH_UNCOMPRESS_H */
...@@ -172,8 +172,4 @@ static inline void arch_decomp_setup(void) ...@@ -172,8 +172,4 @@ static inline void arch_decomp_setup(void)
uart[UART_LCR << DEBUG_UART_SHIFT] = 3; uart[UART_LCR << DEBUG_UART_SHIFT] = 3;
} }
static inline void arch_decomp_wdog(void)
{
}
#endif #endif
...@@ -43,4 +43,3 @@ static inline void flush(void) ...@@ -43,4 +43,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -54,6 +54,4 @@ static inline void arch_decomp_setup(void) ...@@ -54,6 +54,4 @@ static inline void arch_decomp_setup(void)
ux500_uart_base = (void __iomem *)U8500_UART2_BASE; ux500_uart_base = (void __iomem *)U8500_UART2_BASE;
} }
#define arch_decomp_wdog() /* nothing to do here */
#endif /* __ASM_ARCH_UNCOMPRESS_H */ #endif /* __ASM_ARCH_UNCOMPRESS_H */
...@@ -43,4 +43,3 @@ static inline void flush(void) ...@@ -43,4 +43,3 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -34,4 +34,3 @@ static void flush(void) ...@@ -34,4 +34,3 @@ static void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <mach/map.h> #include <mach/map.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#define arch_decomp_wdog()
#define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)
static volatile u32 * const uart_base = (u32 *)UART0_PA; static volatile u32 * const uart_base = (u32 *)UART0_PA;
......
...@@ -38,6 +38,5 @@ static inline void flush(void) ...@@ -38,6 +38,5 @@ static inline void flush(void)
* nothing to do * nothing to do
*/ */
#define arch_decomp_setup() #define arch_decomp_setup()
#define arch_decomp_wdog()
#endif /* __PLAT_UNCOMPRESS_H */ #endif /* __PLAT_UNCOMPRESS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment