Commit 37b36847 authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen

scsi: smartpqi: cleanup controller branding

- Improve controller branding support.
Reviewed-by: default avatarScott Benesh <scott.benesh@microsemi.com>
Signed-off-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5f310425
...@@ -58,9 +58,6 @@ MODULE_SUPPORTED_DEVICE("Microsemi Smart Family Controllers"); ...@@ -58,9 +58,6 @@ MODULE_SUPPORTED_DEVICE("Microsemi Smart Family Controllers");
MODULE_VERSION(DRIVER_VERSION); MODULE_VERSION(DRIVER_VERSION);
MODULE_LICENSE("GPL"); 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_take_ctrl_offline(struct pqi_ctrl_info *ctrl_info);
static void pqi_ctrl_offline_worker(struct work_struct *work); static void pqi_ctrl_offline_worker(struct work_struct *work);
static void pqi_retry_raid_bypass_requests(struct pqi_ctrl_info *ctrl_info); 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, ...@@ -6467,19 +6464,10 @@ static void pqi_print_ctrl_info(struct pci_dev *pci_dev,
{ {
char *ctrl_description; char *ctrl_description;
if (id->driver_data) { if (id->driver_data)
ctrl_description = (char *)id->driver_data; ctrl_description = (char *)id->driver_data;
} else { else
switch (id->subvendor) { ctrl_description = "Microsemi Smart Family Controller";
case PCI_VENDOR_ID_HP:
ctrl_description = hpe_branded_controller;
break;
case PCI_VENDOR_ID_ADAPTEC2:
default:
ctrl_description = microsemi_branded_controller;
break;
}
}
dev_info(&pci_dev->dev, "%s found\n", ctrl_description); dev_info(&pci_dev->dev, "%s found\n", ctrl_description);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment