Skip to content

Commit 8612d94

Browse files
Ranjan Kumarmartinkpetersen
authored andcommitted
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>
1 parent ec54b34 commit 8612d94

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/scsi/mpi3mr/mpi3mr_fw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,8 @@ static inline int mpi3mr_request_irq(struct mpi3mr_ioc *mrioc, u16 index)
776776
intr_info->msix_index = index;
777777
intr_info->op_reply_q = NULL;
778778

779-
snprintf(intr_info->name, MPI3MR_NAME_LENGTH, "%s%d-msix%d",
780-
mrioc->driver_name, mrioc->id, index);
779+
scnprintf(intr_info->name, MPI3MR_NAME_LENGTH,
780+
"%.32s%d-msix%u", mrioc->driver_name, mrioc->id, index);
781781

782782
#ifndef CONFIG_PREEMPT_RT
783783
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,
17891789
scratch_pad0 = ((MPI3MR_RESET_REASON_OSTYPE_LINUX <<
17901790
MPI3MR_RESET_REASON_OSTYPE_SHIFT) | (mrioc->facts.ioc_num <<
17911791
MPI3MR_RESET_REASON_IOCNUM_SHIFT) | reset_reason);
1792-
writel(reset_reason, &mrioc->sysif_regs->scratchpad[0]);
1792+
writel(scratch_pad0, &mrioc->sysif_regs->scratchpad[0]);
17931793
if (reset_type == MPI3_SYSIF_HOST_DIAG_RESET_ACTION_DIAG_FAULT)
17941794
mpi3mr_set_diagsave(mrioc);
17951795
writel(host_diagnostic | reset_type,

drivers/scsi/mpi3mr/mpi3mr_os.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5475,8 +5475,10 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
54755475
if (retval < 0)
54765476
goto id_alloc_failed;
54775477
mrioc->id = (u8)retval;
5478-
sprintf(mrioc->driver_name, "%s", MPI3MR_DRIVER_NAME);
5479-
sprintf(mrioc->name, "%s%d", mrioc->driver_name, mrioc->id);
5478+
strscpy(mrioc->driver_name, MPI3MR_DRIVER_NAME,
5479+
sizeof(mrioc->driver_name));
5480+
scnprintf(mrioc->name, sizeof(mrioc->name),
5481+
"%s%u", mrioc->driver_name, mrioc->id);
54805482
INIT_LIST_HEAD(&mrioc->list);
54815483
spin_lock(&mrioc_list_lock);
54825484
list_add_tail(&mrioc->list, &mrioc_list);

0 commit comments

Comments
 (0)