chardev: add helper function to register char devs with a struct device

[linux.git] / drivers / message / fusion / mptbase.c

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 89c7ed16b4df13057fcadb712ee369316c514ac6..1e73064b0fb2779b5bf14f39d842a8120ffccc04 100644 (file)
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -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;
 
@@ -2868,21 +2865,21 @@ MptDisplayIocCapabilities(MPT_ADAPTER *ioc)
 
        printk(KERN_INFO "%s: ", ioc->name);
        if (ioc->prod_name)
-               printk("%s: ", ioc->prod_name);
-       printk("Capabilities={");
+               pr_cont("%s: ", ioc->prod_name);
+       pr_cont("Capabilities={");
 
        if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_INITIATOR) {
-               printk("Initiator");
+               pr_cont("Initiator");
                i++;
        }
 
        if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) {
-               printk("%sTarget", i ? "," : "");
+               pr_cont("%sTarget", i ? "," : "");
                i++;
        }
 
        if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) {
-               printk("%sLAN", i ? "," : "");
+               pr_cont("%sLAN", i ? "," : "");
                i++;
        }
 
@@ -2891,12 +2888,12 @@ MptDisplayIocCapabilities(MPT_ADAPTER *ioc)
         *  This would probably evoke more questions than it's worth
         */
        if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) {
-               printk("%sLogBusAddr", i ? "," : "");
+               pr_cont("%sLogBusAddr", i ? "," : "");
                i++;
        }
 #endif
 
-       printk("}\n");
+       pr_cont("}\n");
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -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);