aoe: mac_addr: avoid 64-bit arch compiler warnings

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>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 87df18bf4dea1d3f0a45e3efad818520c1ac1933..aecaac3f2e58aa50f0bf00222fee08c7526b393b 100644 (file)
--- 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 c2649c954278e01a888332e2b4e1fdf22142ab24..deea536cc844c1a5bc568971450245be4e81f783 100644 (file)
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -37,8 +37,7 @@ static ssize_t aoedisk_show_mac(struct device *dev,
 
        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 device *dev,
                                  struct device_attribute *attr, char *page)

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 5e7daa1ff6f668eb9b066e27798fff9b72d27acb..1be5150bcd3bb6fddcf0fc8878e4cab32e5e357e 100644 (file)
--- 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 7a38a45ce110145add508956b8b681c63d93527d..ada4a06645e1aaff65dc4a5b641a3eef98c50536 100644 (file)
--- 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