76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
From: Ching Huang <ching2048@areca.com.tw>
|
|
Date: Tue, 19 Aug 2014 15:22:45 +0800
|
|
Subject: [15/19] arcmsr: modify some character strings
|
|
Origin: https://git.kernel.org/linus/aaa64f69480bcde4e203584dfc77d7e4ffb737d6
|
|
Bug-Debian: https://bugs.debian.org/698821
|
|
|
|
Revise comment and some character strings.
|
|
|
|
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 | 24 +++++++++++-------------
|
|
1 file changed, 11 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
index 34a43ed..26bcdc0 100644
|
|
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
@@ -2,11 +2,10 @@
|
|
*******************************************************************************
|
|
** O.S : Linux
|
|
** FILE NAME : arcmsr_hba.c
|
|
-** BY : Nick Cheng
|
|
-** Description: SCSI RAID Device Driver for
|
|
-** ARECA RAID Host adapter
|
|
+** BY : Nick Cheng, C.L. Huang
|
|
+** Description: SCSI RAID Device Driver for Areca RAID Controller
|
|
*******************************************************************************
|
|
-** Copyright (C) 2002 - 2005, Areca Technology Corporation All rights reserved
|
|
+** Copyright (C) 2002 - 2014, Areca Technology Corporation All rights reserved
|
|
**
|
|
** Web site: www.areca.com.tw
|
|
** E-mail: support@areca.com.tw
|
|
@@ -70,8 +69,8 @@
|
|
#include <scsi/scsi_transport.h>
|
|
#include <scsi/scsicam.h>
|
|
#include "arcmsr.h"
|
|
-MODULE_AUTHOR("Nick Cheng <support@areca.com.tw>");
|
|
-MODULE_DESCRIPTION("ARECA (ARC11xx/12xx/16xx/1880) SATA/SAS RAID Host Bus Adapter");
|
|
+MODULE_AUTHOR("Nick Cheng, C.L. Huang <support@areca.com.tw>");
|
|
+MODULE_DESCRIPTION("Areca ARC11xx/12xx/16xx/188x SAS/SATA RAID Controller Driver");
|
|
MODULE_LICENSE("Dual BSD/GPL");
|
|
MODULE_VERSION(ARCMSR_DRIVER_VERSION);
|
|
|
|
@@ -126,8 +125,7 @@ static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev,
|
|
|
|
static struct scsi_host_template arcmsr_scsi_host_template = {
|
|
.module = THIS_MODULE,
|
|
- .name = "ARCMSR ARECA SATA/SAS RAID Controller"
|
|
- ARCMSR_DRIVER_VERSION,
|
|
+ .name = "Areca SAS/SATA RAID driver",
|
|
.info = arcmsr_info,
|
|
.queuecommand = arcmsr_queue_command,
|
|
.eh_abort_handler = arcmsr_abort,
|
|
@@ -3387,14 +3385,14 @@ static const char *arcmsr_info(struct Scsi_Host *host)
|
|
case PCI_DEVICE_ID_ARECA_1680:
|
|
case PCI_DEVICE_ID_ARECA_1681:
|
|
case PCI_DEVICE_ID_ARECA_1880:
|
|
- type = "SAS";
|
|
+ type = "SAS/SATA";
|
|
break;
|
|
default:
|
|
- type = "X-TYPE";
|
|
+ type = "unknown";
|
|
+ raid6 = 0;
|
|
break;
|
|
}
|
|
- sprintf(buf, "Areca %s Host Adapter RAID Controller%s\n %s",
|
|
- type, raid6 ? "( RAID6 capable)" : "",
|
|
- ARCMSR_DRIVER_VERSION);
|
|
+ sprintf(buf, "Areca %s RAID Controller %s\narcmsr version %s\n",
|
|
+ type, raid6 ? "(RAID6 capable)" : "", ARCMSR_DRIVER_VERSION);
|
|
return buf;
|
|
}
|