Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: zImage: simplify decompress_kernel()

The return value for decompress_kernel() is no longer used. Furthermore,
this was obtained and stored in a variable called output_ptr which is
a complete misnomer for what is actually the size of the decompressed
kernel image. Let's get rid of it.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Tony Lindgren <tony@atomide.com>

authored by

Nicolas Pitre and committed by
Nicolas Pitre
e40f1e9f 34cc1a8f

+2 -11
+2 -11
arch/arm/boot/compressed/misc.c
··· 26 26 #include <linux/linkage.h> 27 27 #include <asm/string.h> 28 28 29 - #include <asm/unaligned.h> 30 - 31 29 32 30 static void putstr(const char *ptr); 33 31 extern void error(char *x); ··· 147 149 } 148 150 149 151 /* 150 - * gzip delarations 152 + * gzip declarations 151 153 */ 152 154 extern char input_data[]; 153 155 extern char input_data_end[]; 154 156 155 157 unsigned char *output_data; 156 - unsigned long output_ptr; 157 158 158 159 unsigned long free_mem_ptr; 159 160 unsigned long free_mem_end_ptr; ··· 180 183 extern void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x)); 181 184 182 185 183 - unsigned long 186 + void 184 187 decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, 185 188 unsigned long free_mem_ptr_end_p, 186 189 int arch_id) 187 190 { 188 - unsigned char *tmp; 189 - 190 191 output_data = (unsigned char *)output_start; 191 192 free_mem_ptr = free_mem_ptr_p; 192 193 free_mem_end_ptr = free_mem_ptr_end_p; ··· 192 197 193 198 arch_decomp_setup(); 194 199 195 - tmp = (unsigned char *) (((unsigned long)input_data_end) - 4); 196 - output_ptr = get_unaligned_le32(tmp); 197 - 198 200 putstr("Uncompressing Linux..."); 199 201 do_decompress(input_data, input_data_end - input_data, 200 202 output_data, error); 201 203 putstr(" done, booting the kernel.\n"); 202 - return output_ptr; 203 204 }