62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
From: Ching Huang <ching2048@areca.com.tw>
|
|
Date: Tue, 19 Aug 2014 15:03:55 +0800
|
|
Subject: [09/19] arcmsr: modify printing adapter model number and F/W messages
|
|
Origin: https://git.kernel.org/linus/a2c89bbccac476d42a8526c0c59d081d9e56d0a8
|
|
Bug-Debian: https://bugs.debian.org/698821
|
|
|
|
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 | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
index 5dd520b..0707677 100644
|
|
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
@@ -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(®->message_rwbuffer[0]);
|
|
acb->firm_request_len = readl(®->message_rwbuffer[1]);
|
|
acb->firm_numbers_queue = readl(®->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(®->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(®->msgcode_rwbuffer[1]); /*firm_request_len,1,04-07*/
|
|
pACB->firm_numbers_queue = readl(®->msgcode_rwbuffer[2]); /*firm_numbers_queue,2,08-11*/
|
|
pACB->firm_sdram_size = readl(®->msgcode_rwbuffer[3]); /*firm_sdram_size,3,12-15*/
|