From: "Ed L. Cashin" <ecashin@coraid.com>
To: linux-kernel@vger.kernel.org
Cc: "Ed L. Cashin" <ecashin@coraid.com>, Greg KH <greg@kroah.com>
Subject: [PATCH 03/13] mac_addr: avoid 64-bit arch compiler warnings
Date: Fri, 7 Dec 2007 12:48:01 -0500 [thread overview]
Message-ID: <1197049691-27462-3-git-send-email-ecashin@coraid.com> (raw)
In-Reply-To: <1197049691-27462-1-git-send-email-ecashin@coraid.com>
By returning unsigned long long, mac_addr does not generate compiler
warnings on 64-bit architectures.
Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
---
drivers/block/aoe/aoe.h | 2 +-
drivers/block/aoe/aoeblk.c | 3 +--
drivers/block/aoe/aoecmd.c | 10 +++++-----
drivers/block/aoe/aoenet.c | 4 ++--
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 87df18b..aecaac3 100644
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -198,4 +198,4 @@ void aoenet_xmit(struct sk_buff *);
int is_aoe_netif(struct net_device *ifp);
int set_aoe_iflist(const char __user *str, size_t size);
-u64 mac_addr(char addr[6]);
+unsigned long long mac_addr(char addr[6]);
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index e10a7f3..7168d3d 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -33,8 +33,7 @@ static ssize_t aoedisk_show_mac(struct gendisk * disk, char *page)
if (t == NULL)
return snprintf(page, PAGE_SIZE, "none\n");
- return snprintf(page, PAGE_SIZE, "%012llx\n",
- (unsigned long long)mac_addr(t->addr));
+ return snprintf(page, PAGE_SIZE, "%012llx\n", mac_addr(t->addr));
}
static ssize_t aoedisk_show_netif(struct gendisk * disk, char *page)
{
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 5e7daa1..1be5150 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -309,7 +309,8 @@ resend(struct aoedev *d, struct aoetgt *t, struct frame *f)
"%15s e%ld.%d oldtag=%08x@%08lx newtag=%08x "
"s=%012llx d=%012llx nout=%d\n",
"retransmit", d->aoemajor, d->aoeminor, f->tag, jiffies, n,
- mac_addr(h->src), mac_addr(h->dst), t->nout);
+ mac_addr(h->src),
+ mac_addr(h->dst), t->nout);
aoechr_error(buf);
f->tag = n;
@@ -633,7 +634,7 @@ ataid_complete(struct aoedev *d, struct aoetgt *t, unsigned char *id)
if (d->ssize != ssize)
printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu sectors\n",
- (unsigned long long)mac_addr(t->addr),
+ mac_addr(t->addr),
d->aoemajor, d->aoeminor,
d->fw_ver, (long long)ssize);
d->ssize = ssize;
@@ -727,8 +728,7 @@ aoecmd_ata_rsp(struct sk_buff *skb)
t = gettgt(d, hin->src);
if (t == NULL) {
printk(KERN_INFO "aoe: can't find target e%ld.%d:%012llx\n",
- d->aoemajor, d->aoeminor,
- (unsigned long long) mac_addr(hin->src));
+ d->aoemajor, d->aoeminor, mac_addr(hin->src));
spin_unlock_irqrestore(&d->lock, flags);
return;
}
@@ -1003,7 +1003,7 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
"aoe: e%ld.%d: setting %d%s%s:%012llx\n",
d->aoemajor, d->aoeminor, n,
" byte data frames on ", ifp->nd->name,
- (unsigned long long) mac_addr(t->addr));
+ mac_addr(t->addr));
ifp->maxbcnt = n;
}
}
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 7a38a45..ada4a06 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -83,7 +83,7 @@ set_aoe_iflist(const char __user *user_str, size_t size)
return 0;
}
-u64
+unsigned long long
mac_addr(char addr[6])
{
__be64 n = 0;
@@ -91,7 +91,7 @@ mac_addr(char addr[6])
memcpy(p + 2, addr, 6); /* (sizeof addr != 6) */
- return __be64_to_cpu(n);
+ return (unsigned long long) __be64_to_cpu(n);
}
void
--
1.5.3.4
next prev parent reply other threads:[~2007-12-07 17:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-07 17:47 [PATCH 01/13] bring driver version number to 47 Ed L. Cashin
2007-12-07 17:48 ` [PATCH 02/13] handle multiple network paths to AoE device Ed L. Cashin
2007-12-07 17:48 ` Ed L. Cashin [this message]
2007-12-07 17:48 ` [PATCH 04/13] clean up udev configuration example Ed L. Cashin
2007-12-07 17:48 ` [PATCH 05/13] eliminate goto and improve readability Ed L. Cashin
2007-12-07 17:48 ` [PATCH 06/13] user can ask driver to forget previously detected devices Ed L. Cashin
2007-12-07 17:48 ` [PATCH 07/13] dynamically allocate a capped number of skbs when necessary Ed L. Cashin
2007-12-07 17:48 ` [PATCH 08/13] only install new AoE device once Ed L. Cashin
2007-12-07 17:48 ` [PATCH 09/13] remove race between use and initialization of locks Ed L. Cashin
2007-12-07 17:48 ` [PATCH 10/13] add module parameter for users who need more outstanding I/O Ed L. Cashin
2007-12-07 17:48 ` [PATCH 11/13] remove extra space in prototypes for consistency Ed L. Cashin
2007-12-07 17:48 ` [PATCH 12/13] the aoeminor doesn't need a long format Ed L. Cashin
2007-12-07 17:48 ` [PATCH 13/13] make error messages more specific Ed L. Cashin
2007-12-20 22:15 [PATCH 01/13] bring driver version number to 47 Ed L. Cashin
2007-12-20 22:15 ` [PATCH 03/13] mac_addr: avoid 64-bit arch compiler warnings Ed L. Cashin
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=1197049691-27462-3-git-send-email-ecashin@coraid.com \
--to=ecashin@coraid.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).