Skip to contentSkip to conversation

aoe: suppress compiler warnings

PATCH In review Andy Shevchenko 2 participants 2 messages Aug 26, 2013

Subsystems (2)
Block layer ATA over Ethernet (aoe) driver
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 aoe: suppress compiler warnings

This patch fixes following compiler warnings:

drivers/block/aoe/aoecmd.c: In function ‘aoecmd_ata_rw’:
drivers/block/aoe/aoecmd.c:383:17: warning: variable ‘t’ set but not used [-Wunused-but-set-variable]

  struct aoetgt *t;
                 ^
drivers/block/aoe/aoecmd.c: In function ‘resend’:
drivers/block/aoe/aoecmd.c:488:21: warning: variable ‘ah’ set but not used [-Wunused-but-set-variable]
  struct aoe_atahdr *ah;
                     ^
drivers/block/aoe/aoedev.c: In function 'user_req':
drivers/block/aoe/aoedev.c:252:174: warning: comparison of distinct pointer types lacks a cast [enabled by default]
  lim = min(sizeof(d->gd->disk_name) - (p - d->gd->disk_name), slen);
                                                               ^
Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/block/aoe/aoecmd.c | 4 ----
 drivers/block/aoe/aoedev.c | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/block/aoe/aoecmd.c +0 -4
index 4d45dba..d251543 100644
@@ -380,7 +380,6 @@ aoecmd_ata_rw(struct aoedev *d)
 {
 	struct frame *f;
 	struct buf *buf;
-	struct aoetgt *t;
 	struct sk_buff *skb;
 	struct sk_buff_head queue;
 	ulong bcnt, fbcnt;

@@ -391,7 +390,6 @@ aoecmd_ata_rw(struct aoedev *d)
 	f = newframe(d);
 	if (f == NULL)
 		return 0;
-	t = *d->tgt;
 	bcnt = d->maxbcnt;
 	if (bcnt == 0)
 		bcnt = DEFAULTBCNT;

@@ -485,7 +483,6 @@ resend(struct aoedev *d, struct frame *f)
 	struct sk_buff *skb;
 	struct sk_buff_head queue;
 	struct aoe_hdr *h;
-	struct aoe_atahdr *ah;
 	struct aoetgt *t;
 	char buf[128];
 	u32 n;

@@ -500,7 +497,6 @@ resend(struct aoedev *d, struct frame *f)
 		return;
 	}
 	h = (struct aoe_hdr *) skb_mac_header(skb);
-	ah = (struct aoe_atahdr *) (h+1);
 
 	if (!(f->flags & FFL_PROBE)) {
 		snprintf(buf, sizeof(buf),
drivers/block/aoe/aoedev.c +2 -1
index 6f68095..29dcea3 100644
@@ -249,7 +249,8 @@ user_req(char *s, size_t slen, struct aoedev *d)
 	if (!d->gd)
 		return 0;
 	p = kbasename(d->gd->disk_name);
-	lim = min(sizeof(d->gd->disk_name) - (p - d->gd->disk_name), slen);
+	lim = min_t(size_t, sizeof(d->gd->disk_name) - (p - d->gd->disk_name),
+		slen);
 
 	return !strncmp(s, p, lim);
 }
Signature · 1 line
1.8.4.rc3
#1 lore raw
Quoted 6 lines · Andy Shevchenko

This patch fixes following compiler warnings:

drivers/block/aoe/aoecmd.c: In function ‘aoecmd_ata_rw’:
drivers/block/aoe/aoecmd.c:383:17: warning: variable ‘t’ set but not used [-Wunused-but-set-variable]

 struct aoetgt *t;
                ^

Looks good, thanks.

Signature · 2 lines
  Ed Cashin
  [email protected]