2012-02-16 05:34:26

by Michael Opdenacker

Subject: [PATCH] ARM: boot/compressed/decompress.c cleanup

Changes against Linus' tree

- Remove unused declarations and includes
- Remove the ARCH_HAS_DECOMP_WDOG define
because it is only used in lib/deflate.c, which
only the alpha architecture uses. No other architecture
uses this define
- Remove the Trace<xx> and Assert functions which aren't used
in decompression routines.

Tested successfully on Linux 3.3.0-rc3

Signed-off-by: Michael Opdenacker <[email protected]>
---
arch/arm/boot/compressed/decompress.c | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
index 07be5a2..36f92ca 100644
--- a/arch/arm/boot/compressed/decompress.c
+++ b/arch/arm/boot/compressed/decompress.c
@@ -1,37 +1,14 @@
-#define _LINUX_STRING_H_
-
#include <linux/compiler.h> /* for inline */
#include <linux/types.h> /* for size_t */
#include <linux/stddef.h> /* for NULL */
-#include <linux/linkage.h>
#include <asm/string.h>

extern unsigned long free_mem_ptr;
extern unsigned long free_mem_end_ptr;
-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);}
-# define Trace(x) fprintf x
-# define Tracev(x) {if (verbose) fprintf x ;}
-# define Tracevv(x) {if (verbose>1) fprintf x ;}
-# define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
-# define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
-#else
-# define Assert(cond,msg)
-# define Trace(x)
-# define Tracev(x)
-# define Tracevv(x)
-# define Tracec(c,x)
-# define Tracecv(c,x)
-#endif
-
#ifdef CONFIG_KERNEL_GZIP
#include "../../../../lib/decompress_inflate.c"
#endif
--
1.7.4.1

2012-02-16 08:50:29

by Russell King - ARM Linux

Subject: Re: [PATCH] ARM: boot/compressed/decompress.c cleanup

On Thu, Feb 16, 2012 at 06:34:09AM +0100, Michael Opdenacker wrote:
> - Remove the ARCH_HAS_DECOMP_WDOG define
> because it is only used in lib/deflate.c, which
> only the alpha architecture uses. No other architecture
> uses this define

No. Your grepping is broken.

2012-02-16 11:05:34

by Michael Opdenacker

Subject: Re: [PATCH] ARM: boot/compressed/decompress.c cleanup

Hi Russell,

Thank you for reviewing my patch.

On 02/16/2012 09:50 AM, Russell King - ARM Linux wrote:
> On Thu, Feb 16, 2012 at 06:34:09AM +0100, Michael Opdenacker wrote:
>> - Remove the ARCH_HAS_DECOMP_WDOG define
>> because it is only used in lib/deflate.c, which
>> only the alpha architecture uses. No other architecture
>> uses this define
> No. Your grepping is broken.
Oops, my mistake. Actually, only arm uses this feature.

I'll soon post an updated patch.

Thanks again,

Michael.

--
Michael Opdenacker, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
+33 484 253 396