diff --git a/include/linux/decompress/bunzip2.h b/include/linux/decompress/bunzip2.h
index 53c4bf1b879f0b..9b8921c9cf9ab1 100644
--- a/include/linux/decompress/bunzip2.h
+++ b/include/linux/decompress/bunzip2.h
@@ -2,9 +2,9 @@
 #define DECOMPRESS_BUNZIP2_H
 
 int bunzip2(unsigned char *inbuf, long len,
-	    long(*fill)(void*, unsigned long),
-	    long(*flush)(void*, unsigned long),
+	    long (*fill)(void*, unsigned long),
+	    long (*flush)(void*, unsigned long),
 	    unsigned char *output,
 	    long *pos,
-	    void(*error)(char *x));
+	    void (*error)(char *x));
 #endif
diff --git a/include/linux/decompress/generic.h b/include/linux/decompress/generic.h
index 830b0163c67635..985a540d757f25 100644
--- a/include/linux/decompress/generic.h
+++ b/include/linux/decompress/generic.h
@@ -2,11 +2,11 @@
 #define DECOMPRESS_GENERIC_H
 
 typedef int (*decompress_fn) (unsigned char *inbuf, long len,
-			      long(*fill)(void*, unsigned long),
-			      long(*flush)(void*, unsigned long),
+			      long (*fill)(void*, unsigned long),
+			      long (*flush)(void*, unsigned long),
 			      unsigned char *outbuf,
 			      long *posp,
-			      void(*error)(char *x));
+			      void (*error)(char *x));
 
 /* inbuf   - input buffer
  *len     - len of pre-read data in inbuf
diff --git a/include/linux/decompress/inflate.h b/include/linux/decompress/inflate.h
index 057056d707734f..879d20ede68e01 100644
--- a/include/linux/decompress/inflate.h
+++ b/include/linux/decompress/inflate.h
@@ -2,9 +2,9 @@
 #define LINUX_DECOMPRESS_INFLATE_H
 
 int gunzip(unsigned char *inbuf, long len,
-	   long(*fill)(void*, unsigned long),
-	   long(*flush)(void*, unsigned long),
+	   long (*fill)(void*, unsigned long),
+	   long (*flush)(void*, unsigned long),
 	   unsigned char *output,
 	   long *pos,
-	   void(*error_fn)(char *x));
+	   void (*error_fn)(char *x));
 #endif
diff --git a/include/linux/decompress/unlz4.h b/include/linux/decompress/unlz4.h
index 42929fec70d433..442d65007d5a55 100644
--- a/include/linux/decompress/unlz4.h
+++ b/include/linux/decompress/unlz4.h
@@ -2,9 +2,9 @@
 #define DECOMPRESS_UNLZ4_H
 
 int unlz4(unsigned char *inbuf, long len,
-	long(*fill)(void*, unsigned long),
-	long(*flush)(void*, unsigned long),
+	long (*fill)(void*, unsigned long),
+	long (*flush)(void*, unsigned long),
 	unsigned char *output,
 	long *pos,
-	void(*error)(char *x));
+	void (*error)(char *x));
 #endif
diff --git a/include/linux/decompress/unlzma.h b/include/linux/decompress/unlzma.h
index 5c83c47c792225..8d174e4f877d66 100644
--- a/include/linux/decompress/unlzma.h
+++ b/include/linux/decompress/unlzma.h
@@ -2,11 +2,11 @@
 #define DECOMPRESS_UNLZMA_H
 
 int unlzma(unsigned char *, long,
-	   long(*fill)(void*, unsigned long),
-	   long(*flush)(void*, unsigned long),
+	   long (*fill)(void*, unsigned long),
+	   long (*flush)(void*, unsigned long),
 	   unsigned char *output,
 	   long *posp,
-	   void(*error)(char *x)
+	   void (*error)(char *x)
 	);
 
 #endif
diff --git a/include/linux/decompress/unlzo.h b/include/linux/decompress/unlzo.h
index 86d89f4ba1eec6..ec41bb57e0e03d 100644
--- a/include/linux/decompress/unlzo.h
+++ b/include/linux/decompress/unlzo.h
@@ -2,9 +2,9 @@
 #define DECOMPRESS_UNLZO_H
 
 int unlzo(unsigned char *inbuf, long len,
-	long(*fill)(void*, unsigned long),
-	long(*flush)(void*, unsigned long),
+	long (*fill)(void*, unsigned long),
+	long (*flush)(void*, unsigned long),
 	unsigned char *output,
 	long *pos,
-	void(*error)(char *x));
+	void (*error)(char *x));
 #endif
diff --git a/init/initramfs.c b/init/initramfs.c
index 17e4d597b5beed..f4698f5b1e9f92 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -173,9 +173,9 @@ static __initdata enum state {
 	Reset
 } state, next_state;
 
-static __initdata char *victim;
-static __initdata unsigned long count;
-static __initdata loff_t this_header, next_header;
+static char *victim __initdata;
+static unsigned long count __initdata;
+static loff_t this_header, next_header __initdata;
 
 static inline void __init eat(unsigned n)
 {
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
index f104f46193fe00..8c038f2ae52185 100644
--- a/lib/decompress_bunzip2.c
+++ b/lib/decompress_bunzip2.c
@@ -676,11 +676,11 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
 /* Example usage: decompress src_fd to dst_fd.  (Stops at end of bzip2 data,
    not end of file.) */
 STATIC int INIT bunzip2(unsigned char *buf, long len,
-			long(*fill)(void*, unsigned long),
-			long(*flush)(void*, unsigned long),
+			long (*fill)(void*, unsigned long),
+			long (*flush)(void*, unsigned long),
 			unsigned char *outbuf,
 			long *pos,
-			void(*error)(char *x))
+			void (*error)(char *x))
 {
 	struct bunzip_data *bd;
 	int i = -1;
@@ -744,11 +744,11 @@ STATIC int INIT bunzip2(unsigned char *buf, long len,
 
 #ifdef PREBOOT
 STATIC int INIT decompress(unsigned char *buf, long len,
-			long(*fill)(void*, unsigned long),
-			long(*flush)(void*, unsigned long),
+			long (*fill)(void*, unsigned long),
+			long (*flush)(void*, unsigned long),
 			unsigned char *outbuf,
 			long *pos,
-			void(*error)(char *x))
+			void (*error)(char *x))
 {
 	return bunzip2(buf, len - 4, fill, flush, outbuf, pos, error);
 }
diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c
index f0d36edc58e2c1..f80ff3861a3677 100644
--- a/lib/decompress_inflate.c
+++ b/lib/decompress_inflate.c
@@ -34,11 +34,11 @@ static long INIT nofill(void *buffer, unsigned long len)
 
 /* Included from initramfs et al code */
 STATIC int INIT gunzip(unsigned char *buf, long len,
-		       long(*fill)(void*, unsigned long),
-		       long(*flush)(void*, unsigned long),
+		       long (*fill)(void*, unsigned long),
+		       long (*flush)(void*, unsigned long),
 		       unsigned char *out_buf,
 		       long *pos,
-		       void(*error)(char *x)) {
+		       void (*error)(char *x)) {
 	u8 *zbuf;
 	struct z_stream_s *strm;
 	int rc;
diff --git a/lib/decompress_unlz4.c b/lib/decompress_unlz4.c
index 90b0c6ade26259..d3f87d4d08a6db 100644
--- a/lib/decompress_unlz4.c
+++ b/lib/decompress_unlz4.c
@@ -176,11 +176,11 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
 
 #ifdef PREBOOT
 STATIC int INIT decompress(unsigned char *buf, long in_len,
-			      long(*fill)(void*, unsigned long),
-			      long(*flush)(void*, unsigned long),
+			      long (*fill)(void*, unsigned long),
+			      long (*flush)(void*, unsigned long),
 			      unsigned char *output,
 			      long *posp,
-			      void(*error)(char *x)
+			      void (*error)(char *x)
 	)
 {
 	return unlz4(buf, in_len - 4, fill, flush, output, posp, error);
diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
index 41ac08d3d70d8b..0314ac681e10d5 100644
--- a/lib/decompress_unlzma.c
+++ b/lib/decompress_unlzma.c
@@ -280,7 +280,7 @@ struct writer {
 	size_t buffer_pos;
 	int bufsize;
 	size_t global_pos;
-	long(*flush)(void*, unsigned long);
+	long (*flush)(void*, unsigned long);
 	struct lzma_header *header;
 };
 
@@ -535,11 +535,11 @@ static inline int INIT process_bit1(struct writer *wr, struct rc *rc,
 
 
 STATIC inline int INIT unlzma(unsigned char *buf, long in_len,
-			      long(*fill)(void*, unsigned long),
-			      long(*flush)(void*, unsigned long),
+			      long (*fill)(void*, unsigned long),
+			      long (*flush)(void*, unsigned long),
 			      unsigned char *output,
 			      long *posp,
-			      void(*error)(char *x)
+			      void (*error)(char *x)
 	)
 {
 	struct lzma_header header;
@@ -668,11 +668,11 @@ STATIC inline int INIT unlzma(unsigned char *buf, long in_len,
 
 #ifdef PREBOOT
 STATIC int INIT decompress(unsigned char *buf, long in_len,
-			      long(*fill)(void*, unsigned long),
-			      long(*flush)(void*, unsigned long),
+			      long (*fill)(void*, unsigned long),
+			      long (*flush)(void*, unsigned long),
 			      unsigned char *output,
 			      long *posp,
-			      void(*error)(char *x)
+			      void (*error)(char *x)
 	)
 {
 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error);