scsi: smartpqi: cleanup controller branding

Orabug: 26191021, 26447813

- 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>
(cherry picked from commit 37b36847a94669a898c9e3449d19d522d9c13979)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 5d9fb97927cd874e64708774460218c411126def..bc679fc3f31a324f3795958f1d7664c27687c93a 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -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);
@@ -6506,19 +6503,10 @@ static void pqi_print_ctrl_info(struct pci_dev *pdev,
 {
        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(&pdev->dev, "%s found\n", ctrl_description);
 }