scsi: mpi3mr: Fixed the W=1 compilation warning

Fixed W=1 compilation warnings

Signed-off-by: Ranjan Kumar <ranjan.kumar@broadcom.com>
Link: https://patch.msgid.link/20260116060719.32937-8-ranjan.kumar@broadcom.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
index 0d7515e7144bdf79cb2125bd7248da17364a680d..1b0fcaf6369a0d2c46e0be0e6a64c327beaaa795 100644 (file)
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@ -776,8 +776,8 @@ static inline int mpi3mr_request_irq(struct mpi3mr_ioc *mrioc, u16 index)
        intr_info->msix_index = index;
        intr_info->op_reply_q = NULL;
 
-       snprintf(intr_info->name, MPI3MR_NAME_LENGTH, "%s%d-msix%d",
-           mrioc->driver_name, mrioc->id, index);
+       scnprintf(intr_info->name, MPI3MR_NAME_LENGTH,
+           "%.32s%d-msix%u", mrioc->driver_name, mrioc->id, index);
 
 #ifndef CONFIG_PREEMPT_RT
        retval = request_threaded_irq(pci_irq_vector(pdev, index), mpi3mr_isr,
@@ -1789,7 +1789,7 @@ static int mpi3mr_issue_reset(struct mpi3mr_ioc *mrioc, u16 reset_type,
        scratch_pad0 = ((MPI3MR_RESET_REASON_OSTYPE_LINUX <<
            MPI3MR_RESET_REASON_OSTYPE_SHIFT) | (mrioc->facts.ioc_num <<
            MPI3MR_RESET_REASON_IOCNUM_SHIFT) | reset_reason);
-       writel(reset_reason, &mrioc->sysif_regs->scratchpad[0]);
+       writel(scratch_pad0, &mrioc->sysif_regs->scratchpad[0]);
        if (reset_type == MPI3_SYSIF_HOST_DIAG_RESET_ACTION_DIAG_FAULT)
                mpi3mr_set_diagsave(mrioc);
        writel(host_diagnostic | reset_type,

diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index 2fce5bfb7204799ff981d05bf434480d41b55002..3b46275788c6974968b4db72df2b17489c5be537 100644 (file)
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -5475,8 +5475,10 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (retval < 0)
                goto id_alloc_failed;
        mrioc->id = (u8)retval;
-       sprintf(mrioc->driver_name, "%s", MPI3MR_DRIVER_NAME);
-       sprintf(mrioc->name, "%s%d", mrioc->driver_name, mrioc->id);
+       strscpy(mrioc->driver_name, MPI3MR_DRIVER_NAME,
+           sizeof(mrioc->driver_name));
+       scnprintf(mrioc->name, sizeof(mrioc->name),
+           "%s%u", mrioc->driver_name, mrioc->id);
        INIT_LIST_HEAD(&mrioc->list);
        spin_lock(&mrioc_list_lock);
        list_add_tail(&mrioc->list, &mrioc_list);