summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2011-09-30 12:19:42 +0200
committerWolfgang Denk <wd@denx.de>2011-10-01 23:34:03 +0200
commitcac952ffe3196cb7b1508237bb29d7161e1368c8 (patch)
tree3a059a1dfc4621475988d19e8aa5e6c03b3be02a
parent9099ac3e7edc66debfc3f5367d082f1cb4fb2c78 (diff)
downloadu-boot-imx-cac952ffe3196cb7b1508237bb29d7161e1368c8.zip
u-boot-imx-cac952ffe3196cb7b1508237bb29d7161e1368c8.tar.gz
u-boot-imx-cac952ffe3196cb7b1508237bb29d7161e1368c8.tar.bz2
GCC4.6: Squash warning in vmt.c
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> Acked-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--drivers/mtd/ubi/ubi.h7
-rw-r--r--drivers/mtd/ubi/vmt.c4
2 files changed, 7 insertions, 4 deletions
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);
}