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 3c876967e8b16e5e3bb51c982d8c76e042ab8fb8..bab890f1110a1ff2d68cb6ced738a7f171d44724 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -78,7 +78,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,

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index d3742a83d2fd76476fb6ae48ab39ddff79b11b1b..b0f3bf42c34051b3a0e983e59838d08bca976740 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1615,7 +1615,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);