u-boot yaffs2: Fix compilation warnings
PATCH 1/1 u-boot yaffs2: Fix compilation warnings
Also remove yaffs_hweight and use the hweight in u-boot.
--- fs/yaffs2/Makefile | 2 +- fs/yaffs2/stdio.h | 1 - fs/yaffs2/stdlib.h | 1 - fs/yaffs2/string.h | 4 --- fs/yaffs2/yaffs_hweight.c | 52 --------------------------------------------- fs/yaffs2/yaffs_hweight.h | 24 -------------------- fs/yaffs2/yaffs_mtdif2.c | 3 -- fs/yaffs2/yaffsfs.c | 2 - fs/yaffs2/ydirectenv.h | 16 +++---------- fs/yaffs2/yportenv.h | 1 + 10 files changed, 6 insertions(+), 100 deletions(-) delete mode 100644 fs/yaffs2/stdio.h delete mode 100644 fs/yaffs2/stdlib.h delete mode 100644 fs/yaffs2/string.h delete mode 100644 fs/yaffs2/yaffs_hweight.c delete mode 100644 fs/yaffs2/yaffs_hweight.h
fs/yaffs2/Makefile +1 -1
@@ -23,7 +23,7 @@ LIB = $(obj)libyaffs2.o COBJS-$(CONFIG_YAFFS2) := \ yaffs_allocator.o yaffs_attribs.o yaffs_bitmap.o yaffs_uboot_glue.o\ yaffs_checkptrw.o yaffs_ecc.o yaffs_error.o \ - yaffsfs.o yaffs_guts.o yaffs_hweight.o yaffs_nameval.o yaffs_nand.o\ + yaffsfs.o yaffs_guts.o yaffs_nameval.o yaffs_nand.o\ yaffs_packedtags1.o yaffs_packedtags2.o yaffs_qsort.o \ yaffs_summary.o yaffs_tagscompat.o yaffs_verify.o yaffs_yaffs1.o \ yaffs_yaffs2.o yaffs_mtdif.o yaffs_mtdif2.o
fs/yaffs2/stdio.h deleted +0 -1
@@ -1 +0,0 @@ -/* Dummy header for u-boot */
fs/yaffs2/stdlib.h deleted +0 -1
@@ -1 +0,0 @@ -/* Dummy header for u-boot */
fs/yaffs2/string.h deleted +0 -4
@@ -1,4 +0,0 @@ -#include <linux/stddef.h> -#include <linux/string.h> -#include <linux/stat.h> -#include <common.h>
fs/yaffs2/yaffs_hweight.c deleted +0 -52
52 lines not on this page · raw message
fs/yaffs2/yaffs_hweight.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* -* YAFFS: Yet another Flash File System . A NAND-flash specific file system. -* -* Copyright (C) 2002-2011 Aleph One Ltd. -* for Toby Churchill Ltd and Brightstar Engineering -* -* Created by Charles Manning <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 2.1 as -* published by the Free Software Foundation. -* -* Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. -*/ - -#ifndef __YAFFS_HWEIGHT_H__ -#define __YAFFS_HWEIGHT_H__ - -#include "yportenv.h" - -int yaffs_hweight8 (u8 x); -int yaffs_hweight32 (u32 x); - -#endif
fs/yaffs2/yaffs_mtdif2.c +0 -3
@@ -28,7 +28,6 @@#include "yaffs_trace.h" #include "yaffs_packedtags2.h" -#include "string.h" #define yaffs_dev_to_mtd (dev) ((struct mtd_info *)((dev)->driver_context))#define yaffs_dev_to_lc (dev) ((struct yaffs_linux_context *)((dev)->os_context))
@@ -46,9 +45,7 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,struct mtd_oob_ops ops;int retval =0 ; -loff_t addr; -u8 local_spare[128 ];struct yaffs_packed_tags2 pt;
fs/yaffs2/yaffsfs.c +0 -2
@@ -17,8 +17,6 @@#include "yportenv.h" #include "yaffs_trace.h" -#include "string.h" -#define YAFFSFS_MAX_SYMLINK_DEREFERENCES 5#ifndef NULL
fs/yaffs2/ydirectenv.h +4 -12
@@ -20,15 +20,14 @@#ifndef __YDIRECTENV_H__#define __YDIRECTENV_H__ -#include "stdlib.h" -#include "stdio.h" -#include "string.h" +#include <common.h> +#include <malloc.h> +#include <linux/compat.h> +#include "yaffs_osglue.h" -#include "yaffs_hweight.h" void yaffs_bug_fn (const char *file_name,int line_no); -#define BUG () do { yaffs_bug_fn(__FILE__, __LINE__); } while (0)#define YCHAR char
@@ -47,8 +46,6 @@ void yaffs_bug_fn(const char *file_name, int line_no);#define yaffs_strncmp (a, b, c) strncmp(a, b, c)#endif -#define hweight8 (x) yaffs_hweight8(x) -#define hweight32 (x) yaffs_hweight32(x)void yaffs_qsort (void *aa,size_t n,size_t es,int (*cmp)(const void *,const void *));
@@ -63,11 +60,6 @@ void yaffs_qsort(void *aa, size_t n, size_t es,#define inline __inline__#endif -#define kmalloc (x, flags) yaffsfs_malloc(x) -#define kfree (x) yaffsfs_free(x) -#define vmalloc (x) yaffsfs_malloc(x) -#define vfree (x) yaffsfs_free(x) -#define cond_resched () do {} while (0)#define yaffs_trace (msk, fmt, ...) do { \
fs/yaffs2/yportenv.h +1 -0
@@ -17,6 +17,7 @@#ifndef __YPORTENV_H__#define __YPORTENV_H__ +#include <linux/types.h> /* Definition of types */ #ifdef CONFIG_YAFFS_DEFINES_TYPES
Signature · 1 line
1.7.0.4
Wolfgang Denk
AppliedPATCH 1/1 u-boot yaffs2: Fix compilation warnings
Dear Charles Manning,
Quoted 12 lines · In message <[email protected]> you wrote:
Also remove
yaffs_hweightand use the hweight in u-boot.Signed-off-by Charles Manning <[email protected]>--- fs/yaffs2/Makefile | 2 +- fs/yaffs2/stdio.h | 1 - fs/yaffs2/stdlib.h | 1 - fs/yaffs2/string.h | 4 --- fs/yaffs2/yaffs_hweight.c | 52 --------------------------------------------- fs/yaffs2/yaffs_hweight.h | 24 -------------------- fs/yaffs2/yaffs_mtdif2.c | 3 -- fs/yaffs2/yaffsfs.c | 2 -
Quoted 8 lines
fs/yaffs2/ydirectenv.h | 16 +++---------- fs/yaffs2/yportenv.h | 1 + 10 files changed, 6 insertions(+), 100 deletions(-) delete mode 100644 fs/yaffs2/stdio.h delete mode 100644 fs/yaffs2/stdlib.h delete mode 100644 fs/yaffs2/string.h delete mode 100644 fs/yaffs2/yaffs_hweight.c delete mode 100644 fs/yaffs2/yaffs_hweight.h
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Include the success of others in your dreams for your own success.
PATCH 1/1 u-boot yaffs2: Fix compilation warnings
In reply to Charles ManningDear Charles Manning,
Quoted 3 lines
Also remove
yaffs_hweightand use the hweight in u-boot.Signed-off-by Charles Manning <[email protected]>
we still get these ... can you submit a patch please?
yaffs_guts.c: In function 'yaffs_check_chunk_erased':
yaffs_guts.c:324:6: warning: variable 'result' set but not used [-Wunused-but- set-variable]yaffs_guts.c: In function 'yaffs_verify_chunk_written':
yaffs_guts.c:352:6: warning: variable 'result' set but not used [-Wunused-but- set-variable]yaffs_guts.c: In function 'yaffs_grab_chunk_cache':
yaffs_guts.c:1488:6: warning: variable 'pushout' set but not used [-Wunused-but- set-variable]yaffs_guts.c: In function 'yaffs_check_obj_details_loaded':
yaffs_guts.c:3180:6: warning: variable 'alloc_failed' set but not used [- Wunused-but-set-variable]
yaffs_guts.c:3179:6: warning: variable 'result' set but not used [-Wunused-but- set-variable]yaffs_guts.c: In function 'yaffs_update_oh':
yaffs_guts.c:3288:6: warning: variable 'result' set but not used [-Wunused-but- set-variable]yaffs_guts.c: In function 'yaffs_get_obj_name':
yaffs_guts.c:4447:7: warning: variable 'result' set but not used [-Wunused-but- set-variable]yaffs_summary.c: In function 'yaffs_summary_read':
yaffs_summary.c:194:6: warning: variable 'sum_tags_bytes' set but not used [- Wunused-but-set-variable]yaffs_verify.c: In function 'yaffs_verify_file':
yaffs_verify.c:227:6: warning: variable 'actual_depth' set but not used [- Wunused-but-set-variable]yaffs_yaffs1.c: In function 'yaffs1_scan':
yaffs_yaffs1.c:26:6: warning: variable 'result' set but not used [-Wunused-but- set-variable]yaffs_yaffs2.c: In function 'yaffs2_scan_chunk':
yaffs_yaffs2.c:949:6: warning: variable 'result' set but not used [-Wunused-but- set-variable]yaffs_yaffs2.c: In function 'yaffs2_scan_backwards':
yaffs_yaffs2.c:1352:6: warning: variable 'deleted' set but not used [-Wunused- but-set-variable]