summaryrefslogtreecommitdiff
path: root/lib/gunzip.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2010-09-08 15:34:58 +0200
committerWolfgang Denk <wd@denx.de>2010-10-12 21:15:10 +0200
commitf852628638654f2dfa5eee3ec6a307a17b138ba7 (patch)
tree06d273a843f009b70e1b61614550cec6585078aa /lib/gunzip.c
parent6213b8ffa58ed605cefb8de25c2d103dcba56502 (diff)
zlib/gunzip: Use WATCHDOG_RESET macro
As usually done in U-Boot, the watchdog_reset code is called via a macro (WATCHDOG_RESET). In zlib.c this was done differently, by using a function pointer which is initialized with WATCHDOG_RESET upon watchdog usage or with NULL otherwise. This patch now uses the plain WATCHDOG_RESET macros to call the function resulting in slightly smaller U-Boot images and simpler code. U-Boot code size reduction: PowerPC board with watchdog support (lwmon5): -> 80 bytes smaller image size PowerPC board without watchdog support (sequoia): -> 112 bytes smaller image size Signed-off-by: Stefan Roese <sr@denx.de> Cc: Detlev Zundel <dzu@denx.de> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
Diffstat (limited to 'lib/gunzip.c')
-rw-r--r--lib/gunzip.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/gunzip.c b/lib/gunzip.c
index d2b7ad47791..482a4768a3f 100644
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -96,11 +96,6 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
s.zalloc = zalloc;
s.zfree = zfree;
-#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
- s.outcb = (cb_func)WATCHDOG_RESET;
-#else
- s.outcb = Z_NULL;
-#endif /* CONFIG_HW_WATCHDOG */
r = inflateInit2(&s, -MAX_WBITS);
if (r != Z_OK) {