From: Bikash Hazarika <bhazarika@marvell.com>

Date: Tue, 12 Jul 2022 22:20:44 -0700

Subject: scsi: qla2xxx: Update manufacturer details

Patch-mainline: v5.20-rc1

Git-commit: 1ccad27716ecad1fd58c35e579bedb81fa5e1ad5

References: bsc#1201958

Update manufacturer details to indicate Marvell Semiconductors.

Link: https://lore.kernel.org/r/20220713052045.10683-10-njavali@marvell.com

Cc: stable@vger.kernel.org

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

Signed-off-by: Bikash Hazarika <bhazarika@marvell.com>

Signed-off-by: Nilesh Javali <njavali@marvell.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Acked-by: Daniel Wagner <dwagner@suse.de>

---

 drivers/scsi/qla2xxx/qla_def.h |    2 +-

 drivers/scsi/qla2xxx/qla_gs.c  |    2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/scsi/qla2xxx/qla_def.h

+++ b/drivers/scsi/qla2xxx/qla_def.h

@@ -79,7 +79,7 @@ typedef union {

 #include "qla_nvme.h"

 #define QLA2XXX_DRIVER_NAME	"qla2xxx"

 #define QLA2XXX_APIDEV		"ql2xapidev"

-#define QLA2XXX_MANUFACTURER	"QLogic Corporation"

+#define QLA2XXX_MANUFACTURER	"Marvell Semiconductor, Inc."

 /*

  * We have MAILBOX_REGISTER_COUNT sized arrays in a few places,

--- a/drivers/scsi/qla2xxx/qla_gs.c

+++ b/drivers/scsi/qla2xxx/qla_gs.c

@@ -1617,7 +1617,7 @@ qla2x00_hba_attributes(scsi_qla_host_t *

 	eiter->type = cpu_to_be16(FDMI_HBA_MANUFACTURER);

 	alen = scnprintf(

 		eiter->a.manufacturer, sizeof(eiter->a.manufacturer),

-		"%s", "QLogic Corporation");

+		"%s", QLA2XXX_MANUFACTURER);

 	alen += FDMI_ATTR_ALIGNMENT(alen);

 	alen += FDMI_ATTR_TYPELEN(eiter);

 	eiter->len = cpu_to_be16(alen);