diff mbox

[U-Boot,3/5,V2] GCC4.6: Squash warning in vmt.c

Message ID 1317377982-10884-1-git-send-email-marek.vasut@gmail.com
State Accepted
Commit cac952ffe3196cb7b1508237bb29d7161e1368c8
Headers show

Commit Message

Marek Vasut Sept. 30, 2011, 10:19 a.m. UTC 
vmt.c: In function ‘ubi_free_volume’:
vmt.c:681:6: warning: variable ‘err’ set but not used
[-Wunused-but-set-variable]

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 drivers/mtd/ubi/ubi.h |    7 ++++++-
 drivers/mtd/ubi/vmt.c |    4 +---
 2 files changed, 7 insertions(+), 4 deletions(-)

V2: Convert ubi_destroy_gluebi() to inline fn

Comments

Mike Frysinger Sept. 30, 2011, 3:57 p.m. UTC | #1 
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
diff mbox

Patch

diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index bf77a15..14c3a5f 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -467,7 +467,12 @@  int ubi_destroy_gluebi(struct ubi_volume *vol);
 void ubi_gluebi_updated(struct ubi_volume *vol);
 #else
 #define ubi_create_gluebi(ubi, vol) 0
-#define ubi_destroy_gluebi(vol) 0
+
+static inline int ubi_destroy_gluebi(struct ubi_volume *vol)
+{
+	return 0;
+}
+
 #define ubi_gluebi_updated(vol)
 #endif
 
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 061da64..ce9fec7 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -678,12 +678,10 @@  out_cdev:
  */
 void ubi_free_volume(struct ubi_device *ubi, struct ubi_volume *vol)
 {
-	int err;
-
 	dbg_msg("free volume %d", vol->vol_id);
 
 	ubi->volumes[vol->vol_id] = NULL;
-	err = ubi_destroy_gluebi(vol);
+	ubi_destroy_gluebi(vol);
 	cdev_del(&vol->cdev);
 	volume_sysfs_close(vol);
 }