From: Kevin Barnett Date: Wed, 3 May 2017 23:55:01 +0000 (-0500) Subject: scsi: smartpqi: cleanup controller branding X-Git-Tag: v4.1.12-107.0.20170801_2000~35 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c0c5324453ffe17abc0535ded69858aa08596a42;p=users%2Fjedix%2Flinux-maple.git scsi: smartpqi: cleanup controller branding Orabug: 26191021, 26447813 - Improve controller branding support. Reviewed-by: Scott Benesh Signed-off-by: Kevin Barnett Signed-off-by: Don Brace Signed-off-by: Martin K. Petersen (cherry picked from commit 37b36847a94669a898c9e3449d19d522d9c13979) Signed-off-by: Brian Maly --- diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 5d9fb97927cd..bc679fc3f31a 100644 --- 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); }