]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
arcmsr: modify printing adapter model number and F/W messages
authorChing Huang <ching2048@areca.com.tw>
Tue, 19 Aug 2014 07:03:55 +0000 (15:03 +0800)
committerChristoph Hellwig <hch@lst.de>
Tue, 16 Sep 2014 16:39:47 +0000 (09:39 -0700)
Adjust printing order of adapter model name and firmware version.

Signed-off-by: Ching Huang <ching2048@areca.com.tw>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/arcmsr/arcmsr_hba.c

index 5dd520b3b6e25cbce36fca27a444052b73b82a74..0707677c11a167dba9f52b65ecbdb3b728877303 100644 (file)
@@ -2207,10 +2207,10 @@ static bool arcmsr_get_hba_config(struct AdapterControlBlock *acb)
                iop_device_map++;
                count--;
        }
-       printk(KERN_NOTICE "Areca RAID Controller%d: F/W %s & Model %s\n", 
+       pr_notice("Areca RAID Controller%d: Model %s, F/W %s\n",
                acb->host->host_no,
-               acb->firm_version,
-               acb->firm_model);
+               acb->firm_model,
+               acb->firm_version);
        acb->signature = readl(&reg->message_rwbuffer[0]);
        acb->firm_request_len = readl(&reg->message_rwbuffer[1]);
        acb->firm_numbers_queue = readl(&reg->message_rwbuffer[2]);
@@ -2283,10 +2283,10 @@ static bool arcmsr_get_hbb_config(struct AdapterControlBlock *acb)
                count--;
        }
        
-       printk(KERN_NOTICE "Areca RAID Controller%d: F/W %s & Model %s\n",
+       pr_notice("Areca RAID Controller%d: Model %s, F/W %s\n",
                acb->host->host_no,
-               acb->firm_version,
-               acb->firm_model);
+               acb->firm_model,
+               acb->firm_version);
 
        acb->signature = readl(&reg->message_rwbuffer[1]);
        /*firm_signature,1,00-03*/
@@ -2349,10 +2349,10 @@ static bool arcmsr_get_hbc_config(struct AdapterControlBlock *pACB)
                iop_firm_version++;
                count--;
        }
-       printk(KERN_NOTICE "Areca RAID Controller%d: F/W %s & Model %s\n",
+       pr_notice("Areca RAID Controller%d: Model %s, F/W %s\n",
                pACB->host->host_no,
-               pACB->firm_version,
-               pACB->firm_model);
+               pACB->firm_model,
+               pACB->firm_version);
        pACB->firm_request_len = readl(&reg->msgcode_rwbuffer[1]);   /*firm_request_len,1,04-07*/
        pACB->firm_numbers_queue = readl(&reg->msgcode_rwbuffer[2]); /*firm_numbers_queue,2,08-11*/
        pACB->firm_sdram_size = readl(&reg->msgcode_rwbuffer[3]);    /*firm_sdram_size,3,12-15*/