Skip to content

Commit eeb270a

Browse files
kawasakimartinkpetersen
authored andcommitted
scsi: mpi3mr: Remove unnecessary memcpy() to alltgt_info->dmi
In the function mpi3mr_get_all_tgt_info(), devmap_info points to alltgt_info->dmi then there is no need to memcpy() data from devmap_info to alltgt_info->dmi. Remove the unnecessary memcpy(). This also allows to remove the local variable 'rval' and the goto label 'out'. Link: https://lore.kernel.org/r/20230214005019.1897251-3-shinichiro.kawasaki@wdc.com Cc: stable@vger.kernel.org Fixes: f5e6d5a ("scsi: mpi3mr: Add support for driver commands") Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> Acked-by: Sathya Prakash Veerichetty <sathya.prakash@broadcom.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent fb428a2 commit eeb270a

1 file changed

Lines changed: 2 additions & 11 deletions

File tree

drivers/scsi/mpi3mr/mpi3mr_app.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ static long mpi3mr_bsg_pel_enable(struct mpi3mr_ioc *mrioc,
293293
static long mpi3mr_get_all_tgt_info(struct mpi3mr_ioc *mrioc,
294294
struct bsg_job *job)
295295
{
296-
long rval = -EINVAL;
297296
u16 num_devices = 0, i = 0, size;
298297
unsigned long flags;
299298
struct mpi3mr_tgt_dev *tgtdev;
@@ -304,7 +303,7 @@ static long mpi3mr_get_all_tgt_info(struct mpi3mr_ioc *mrioc,
304303
if (job->request_payload.payload_len < sizeof(u32)) {
305304
dprint_bsg_err(mrioc, "%s: invalid size argument\n",
306305
__func__);
307-
return rval;
306+
return -EINVAL;
308307
}
309308

310309
spin_lock_irqsave(&mrioc->tgtdev_lock, flags);
@@ -350,20 +349,12 @@ static long mpi3mr_get_all_tgt_info(struct mpi3mr_ioc *mrioc,
350349
sizeof(*devmap_info);
351350
usr_entrylen *= sizeof(*devmap_info);
352351
min_entrylen = min(usr_entrylen, kern_entrylen);
353-
if (min_entrylen && (!memcpy(&alltgt_info->dmi, devmap_info, min_entrylen))) {
354-
dprint_bsg_err(mrioc, "%s:%d: device map info copy failed\n",
355-
__func__, __LINE__);
356-
rval = -EFAULT;
357-
goto out;
358-
}
359352

360353
sg_copy_from_buffer(job->request_payload.sg_list,
361354
job->request_payload.sg_cnt,
362355
alltgt_info, (min_entrylen + sizeof(u64)));
363-
rval = 0;
364-
out:
365356
kfree(alltgt_info);
366-
return rval;
357+
return 0;
367358
}
368359
/**
369360
* mpi3mr_get_change_count - Get topology change count

0 commit comments

Comments
 (0)