From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/5 V2] GCC4.6: Squash warning in vmt.c
Date: Fri, 30 Sep 2011 12:19:42 +0200 [thread overview]
Message-ID: <1317377982-10884-1-git-send-email-marek.vasut@gmail.com> (raw)
In-Reply-To: <1317377606-9830-3-git-send-email-marek.vasut@gmail.com>
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
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);
}
--
1.7.5.4
next prev parent reply other threads:[~2011-09-30 10:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-30 10:13 [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Marek Vasut
2011-09-30 10:13 ` [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c Marek Vasut
2011-09-30 10:14 ` Marek Vasut
2011-10-03 16:22 ` Scott Wood
2011-09-30 15:57 ` Mike Frysinger
2011-10-01 21:31 ` Wolfgang Denk
2011-09-30 10:13 ` [U-Boot] [PATCH 3/5] GCC4.6: Squash warning in vmt.c Marek Vasut
2011-09-30 10:19 ` Marek Vasut [this message]
2011-09-30 15:57 ` [U-Boot] [PATCH 3/5 V2] " Mike Frysinger
2011-09-30 15:57 ` [U-Boot] [PATCH 3/5] " Mike Frysinger
2011-09-30 10:13 ` [U-Boot] [PATCH 4/5] GCC4.6: Squash warning in cmd_ubi.c: Marek Vasut
2011-09-30 15:54 ` Mike Frysinger
2011-09-30 10:13 ` [U-Boot] [PATCH 5/5] GCC4.6: Squash warning in lzo1x_decompress.c Marek Vasut
2011-09-30 15:56 ` Mike Frysinger
2011-09-30 15:57 ` [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Mike Frysinger
2011-10-01 21:28 ` Wolfgang Denk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317377982-10884-1-git-send-email-marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox