p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scsi: smartpqi: cleanup controller branding 

- Improve controller branding support.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Kevin Barnett 2017-05-03 18:55:01 -05:00 committed by Martin K. Petersen
parent 5f310425c8
commit 37b36847a9
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/scsi/smartpqi/smartpqi_init.c
View File

@ -58,9 +58,6 @@ MODULE_SUPPORTED_DEVICE("Microsemi Smart Family Controllers");
MODULE_VERSION(DRIVER_VERSION);
MODULE_LICENSE("GPL");
static char *hpe_branded_controller = "HPE Smart Array Controller";
static char *microsemi_branded_controller = "Microsemi Smart Family Controller";
static void pqi_take_ctrl_offline(struct pqi_ctrl_info *ctrl_info);
static void pqi_ctrl_offline_worker(struct work_struct *work);
static void pqi_retry_raid_bypass_requests(struct pqi_ctrl_info *ctrl_info);
@ -6467,19 +6464,10 @@ static void pqi_print_ctrl_info(struct pci_dev *pci_dev,
{
char *ctrl_description;
if (id->driver_data) {
if (id->driver_data)
ctrl_description = (char *)id->driver_data;
} else {
switch (id->subvendor) {
case PCI_VENDOR_ID_HP:
ctrl_description = hpe_branded_controller;
break;
case PCI_VENDOR_ID_ADAPTEC2:
default:
ctrl_description = microsemi_branded_controller;
break;
}
}
else
ctrl_description = "Microsemi Smart Family Controller";
dev_info(&pci_dev->dev, "%s found\n", ctrl_description);
}