diff options
Diffstat (limited to 'fs/jffs2')
-rw-r--r-- | fs/jffs2/compr_lzo.c | 1 | ||||
-rw-r--r-- | fs/jffs2/compr_rubin.c | 1 | ||||
-rw-r--r-- | fs/jffs2/compr_zlib.c | 2 | ||||
-rw-r--r-- | fs/jffs2/jffs2_1pass.c | 13 | ||||
-rw-r--r-- | fs/jffs2/jffs2_private.h | 1 | ||||
-rw-r--r-- | fs/jffs2/mergesort.c | 1 | ||||
-rw-r--r-- | fs/jffs2/mini_inflate.c | 2 |
7 files changed, 0 insertions, 21 deletions
diff --git a/fs/jffs2/compr_lzo.c b/fs/jffs2/compr_lzo.c index e648ec4fb2e..892766e12eb 100644 --- a/fs/jffs2/compr_lzo.c +++ b/fs/jffs2/compr_lzo.c @@ -65,7 +65,6 @@ */ - #include <config.h> #include <linux/stddef.h> #include <jffs2/jffs2.h> diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c index 9ff22177382..88b65845997 100644 --- a/fs/jffs2/compr_rubin.c +++ b/fs/jffs2/compr_rubin.c @@ -42,7 +42,6 @@ #include <jffs2/jffs2.h> #include <jffs2/compr_rubin.h> - void rubin_do_decompress(unsigned char *bits, unsigned char *in, unsigned char *page_out, __u32 destlen) { diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c index d306b6dc4cf..e1e3c15e75e 100644 --- a/fs/jffs2/compr_zlib.c +++ b/fs/jffs2/compr_zlib.c @@ -35,8 +35,6 @@ * */ -#include <common.h> -#include <config.h> #include <jffs2/jffs2.h> #include <jffs2/mini_inflate.h> diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 49ba82ef959..b5f74d65017 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -110,8 +110,6 @@ * it should probably be dumped and replaced by something like jffs2reader! */ - -#include <common.h> #include <config.h> #include <malloc.h> #include <div64.h> @@ -127,7 +125,6 @@ #include "jffs2_private.h" - #define NODE_CHUNK 1024 /* size of memory allocation chunk in b_nodes */ #define SPIN_BLKSIZE 18 /* spin after having scanned 1<<BLKSIZE bytes */ @@ -136,7 +133,6 @@ #undef DEBUG_FRAGMENTS /* print fragment list after scan */ #undef DEBUG /* enable debugging messages */ - #ifdef DEBUG # define DEBUGF(fmt,args...) printf(fmt ,##args) #else @@ -371,14 +367,12 @@ static void *get_node_mem_onenand(u32 off, void *ext_buf) return ret; } - static void put_fl_mem_onenand(void *buf) { free(buf); } #endif - #if defined(CONFIG_CMD_FLASH) #include <flash.h> @@ -415,7 +409,6 @@ static inline void *get_node_mem_nor(u32 off, void *ext_buf) } #endif - /* * Generic jffs2 raw memory and node read routines. * @@ -516,7 +509,6 @@ struct mem_block { struct b_node nodes[NODE_CHUNK]; }; - static void free_nodes(struct b_list *list) { @@ -1855,7 +1847,6 @@ jffs2_1pass_build_lists(struct part_info * part) return 1; } - static u32 jffs2_1pass_fill_info(struct b_lists * pL, struct b_jffs2_info * piL) { @@ -1884,7 +1875,6 @@ jffs2_1pass_fill_info(struct b_lists * pL, struct b_jffs2_info * piL) return 0; } - static struct b_lists * jffs2_get_list(struct part_info * part, const char *who) { @@ -1900,7 +1890,6 @@ jffs2_get_list(struct part_info * part, const char *who) return (struct b_lists *)part->jffs2_priv; } - /* Print directory / file contents */ u32 jffs2_1pass_ls(struct part_info * part, const char *fname) @@ -1917,7 +1906,6 @@ jffs2_1pass_ls(struct part_info * part, const char *fname) return 0; } - #if 0 putLabeledWord("found file at inode = ", inode); putLabeledWord("read_inode returns = ", ret); @@ -1926,7 +1914,6 @@ jffs2_1pass_ls(struct part_info * part, const char *fname) return ret; } - /* Load a file from flash into memory. fname can be a full path */ u32 jffs2_1pass_load(char *dest, struct part_info * part, const char *fname) diff --git a/fs/jffs2/jffs2_private.h b/fs/jffs2/jffs2_private.h index 65d19a76f97..9284ab5c2c1 100644 --- a/fs/jffs2/jffs2_private.h +++ b/fs/jffs2/jffs2_private.h @@ -3,7 +3,6 @@ #include <jffs2/jffs2.h> - struct b_node { u32 offset; struct b_node *next; diff --git a/fs/jffs2/mergesort.c b/fs/jffs2/mergesort.c index fca77aa6511..495937d792d 100644 --- a/fs/jffs2/mergesort.c +++ b/fs/jffs2/mergesort.c @@ -7,7 +7,6 @@ * http://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html */ -#include <common.h> #include "jffs2_private.h" int sort_list(struct b_list *list) diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c index 3072eedd8c1..12ab180d2f0 100644 --- a/fs/jffs2/mini_inflate.c +++ b/fs/jffs2/mini_inflate.c @@ -336,11 +336,9 @@ static void decompress_fixed(struct bitstream *stream, unsigned char *dest) cramfs_memset(distance->lengths, 5, 32); distance->count[5] = 32; - fill_code_tables(lengths); fill_code_tables(distance); - decompress_huffman(stream, dest); } |