drivers/net/enic: Use %pUB to format a UUID
authorJoe Perches <joe@perches.com>
Tue, 3 Aug 2010 09:32:24 +0000 (09:32 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Aug 2010 23:18:04 +0000 (16:18 -0700)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/enic/enic_main.c

index 77a7f87d498e5800fe8e9708d54b34a2e43c6bc0..9aab85366d21e782e0f60d5c2e917f3ee2759780 100644 (file)
@@ -1087,10 +1087,7 @@ static int enic_set_port_profile(struct enic *enic, u8 *mac)
 {
        struct vic_provinfo *vp;
        u8 oui[3] = VIC_PROVINFO_CISCO_OUI;
-       u8 *uuid;
        char uuid_str[38];
-       static char *uuid_fmt = "%02X%02X%02X%02X-%02X%02X-%02X%02X-"
-               "%02X%02X-%02X%02X%02X%02X%0X%02X";
        int err;
 
        err = enic_vnic_dev_deinit(enic);
@@ -1121,24 +1118,14 @@ static int enic_set_port_profile(struct enic *enic, u8 *mac)
                        ETH_ALEN, mac);
 
                if (enic->pp.set & ENIC_SET_INSTANCE) {
-                       uuid = enic->pp.instance_uuid;
-                       sprintf(uuid_str, uuid_fmt,
-                               uuid[0],  uuid[1],  uuid[2],  uuid[3],
-                               uuid[4],  uuid[5],  uuid[6],  uuid[7],
-                               uuid[8],  uuid[9],  uuid[10], uuid[11],
-                               uuid[12], uuid[13], uuid[14], uuid[15]);
+                       sprintf(uuid_str, "%pUB", enic->pp.instance_uuid);
                        vic_provinfo_add_tlv(vp,
                                VIC_LINUX_PROV_TLV_CLIENT_UUID_STR,
                                sizeof(uuid_str), uuid_str);
                }
 
                if (enic->pp.set & ENIC_SET_HOST) {
-                       uuid = enic->pp.host_uuid;
-                       sprintf(uuid_str, uuid_fmt,
-                               uuid[0],  uuid[1],  uuid[2],  uuid[3],
-                               uuid[4],  uuid[5],  uuid[6],  uuid[7],
-                               uuid[8],  uuid[9],  uuid[10], uuid[11],
-                               uuid[12], uuid[13], uuid[14], uuid[15]);
+                       sprintf(uuid_str, "%pUB", enic->pp.host_uuid);
                        vic_provinfo_add_tlv(vp,
                                VIC_LINUX_PROV_TLV_HOST_UUID_STR,
                                sizeof(uuid_str), uuid_str);