]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
scsi: fusion: print lan address via %pMR
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Sat, 22 Oct 2016 17:32:27 +0000 (20:32 +0300)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 8 Nov 2016 22:29:57 +0000 (17:29 -0500)
LAN MAC addresses can be printed directly using %pMR specifier.

Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Chaitra P B <chaitra.basappa@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/message/fusion/mptbase.c

index 89c7ed16b4df13057fcadb712ee369316c514ac6..f82745c6cdf74f4ee515595054d49b1b2a79327a 100644 (file)
@@ -2585,10 +2585,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                                (void) GetLanConfigPages(ioc);
                                a = (u8*)&ioc->lan_cnfg_page1.HardwareAddressLow;
                                dprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-                                       "LanAddr = %02X:%02X:%02X"
-                                       ":%02X:%02X:%02X\n",
-                                       ioc->name, a[5], a[4],
-                                       a[3], a[2], a[1], a[0]));
+                                       "LanAddr = %pMR\n", ioc->name, a));
                        }
                        break;
 
@@ -6783,8 +6780,7 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
                if (ioc->bus_type == FC) {
                        if (ioc->pfacts[p].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) {
                                u8 *a = (u8*)&ioc->lan_cnfg_page1.HardwareAddressLow;
-                               seq_printf(m, "    LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n",
-                                               a[5], a[4], a[3], a[2], a[1], a[0]);
+                               seq_printf(m, "    LanAddr = %pMR\n", a);
                        }
                        seq_printf(m, "    WWN = %08X%08X:%08X%08X\n",
                                        ioc->fc_port_page0[p].WWNN.High,
@@ -6861,8 +6857,7 @@ mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buffer, int *size, int len, int sh
 
        if (showlan && (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN)) {
                u8 *a = (u8*)&ioc->lan_cnfg_page1.HardwareAddressLow;
-               y += sprintf(buffer+len+y, ", LanAddr=%02X:%02X:%02X:%02X:%02X:%02X",
-                       a[5], a[4], a[3], a[2], a[1], a[0]);
+               y += sprintf(buffer+len+y, ", LanAddr=%pMR", a);
        }
 
        y += sprintf(buffer+len+y, ", IRQ=%d", ioc->pci_irq);
@@ -6896,8 +6891,7 @@ static void seq_mpt_print_ioc_summary(MPT_ADAPTER *ioc, struct seq_file *m, int
 
        if (showlan && (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN)) {
                u8 *a = (u8*)&ioc->lan_cnfg_page1.HardwareAddressLow;
-               seq_printf(m, ", LanAddr=%02X:%02X:%02X:%02X:%02X:%02X",
-                       a[5], a[4], a[3], a[2], a[1], a[0]);
+               seq_printf(m, ", LanAddr=%pMR", a);
        }
 
        seq_printf(m, ", IRQ=%d", ioc->pci_irq);