scsi: qla2xxx: Update manufacturer details

[ Upstream commit 1ccad27716ecad1fd58c35e579bedb81fa5e1ad5 ]

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>
Stable-dep-of: 688fa069fda6 ("scsi: qla2xxx: Update manufacturer detail")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 6645b69fc2a0f36a64bc1107162e7bbaa2f0deb4..7dfd93cb4674d62f888f278bd97cfc0c487949c2 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -56,7 +56,7 @@ typedef struct {
 #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,

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 20bbd69e35e512d4a5dba9fcbd637441b9f2acd2..d9ac17dbad78997be20b710b143dc3f41d14b4ce 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1614,7 +1614,7 @@ qla2x00_hba_attributes(scsi_qla_host_t *vha, void *entries,
        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);