summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen Hofstee <jeroen@myspectrum.nl>2014-07-12 15:16:51 +0200
committerTom Rini <trini@ti.com>2014-07-18 17:53:23 -0400
commite803fa2c4b9313a9efc7b9f87a49839d542d9615 (patch)
tree68ce99724dc707f156672d00daacf0f1bab680ad
parent82c3a4c445939a12df1f6c7ee245d2d801672186 (diff)
downloadtalos-obmc-uboot-e803fa2c4b9313a9efc7b9f87a49839d542d9615.tar.gz
talos-obmc-uboot-e803fa2c4b9313a9efc7b9f87a49839d542d9615.zip
yaffs2: cosmetic: remove self assignments
Remove self assignments which is just dead code to prevent compiler warnings about non used arguments. For u-boot this does not prevent any warning though, on the contrary it actual introduces warnings when compiling with clang. Remove them. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
-rw-r--r--fs/yaffs2/yaffs_guts.c11
-rw-r--r--fs/yaffs2/yaffs_verify.c4
-rw-r--r--fs/yaffs2/yaffsfs.c8
3 files changed, 1 insertions, 22 deletions
diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c
index 21441fd991..1fa59105c1 100644
--- a/fs/yaffs2/yaffs_guts.c
+++ b/fs/yaffs2/yaffs_guts.c
@@ -219,18 +219,11 @@ static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk,
const u8 *data,
const struct yaffs_ext_tags *tags)
{
- dev = dev;
- nand_chunk = nand_chunk;
- data = data;
- tags = tags;
}
static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk,
const struct yaffs_ext_tags *tags)
{
- dev = dev;
- nand_chunk = nand_chunk;
- tags = tags;
}
void yaffs_handle_chunk_error(struct yaffs_dev *dev,
@@ -814,8 +807,6 @@ struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
int required_depth;
int level = file_struct->top_level;
- dev = dev;
-
/* Check sane level and chunk Id */
if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
return NULL;
@@ -3214,7 +3205,6 @@ static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name,
}
} else {
#else
- dev = dev;
{
#endif
yaffs_strncpy(name, oh_name, buff_size - 1);
@@ -3258,7 +3248,6 @@ static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name,
}
} else {
#else
- dev = dev;
{
#endif
yaffs_strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1);
diff --git a/fs/yaffs2/yaffs_verify.c b/fs/yaffs2/yaffs_verify.c
index 97734a9e29..3fef28bdcb 100644
--- a/fs/yaffs2/yaffs_verify.c
+++ b/fs/yaffs2/yaffs_verify.c
@@ -19,20 +19,17 @@
int yaffs_skip_verification(struct yaffs_dev *dev)
{
- dev = dev;
return !(yaffs_trace_mask &
(YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
}
static int yaffs_skip_full_verification(struct yaffs_dev *dev)
{
- dev = dev;
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
}
static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
{
- dev = dev;
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
}
@@ -521,6 +518,5 @@ void yaffs_verify_free_chunks(struct yaffs_dev *dev)
int yaffs_verify_file_sane(struct yaffs_obj *in)
{
- in = in;
return YAFFS_OK;
}
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index 334598eedf..41e5f0108c 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -3136,10 +3136,6 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
{
- pathname = pathname;
- mode = mode;
- dev = dev;
-
yaffsfs_SetError(-EINVAL);
return -1;
}
@@ -3187,9 +3183,7 @@ int yaffs_set_error(int error)
int yaffs_dump_dev(const YCHAR *path)
{
-#if 1
- path = path;
-#else
+#if 0
YCHAR *rest;
struct yaffs_obj *obj = yaffsfs_FindRoot(path, &rest);
OpenPOWER on IntegriCloud