Skip to content

Commit dad662c

Browse files
David Strahanmartinkpetersen
authored andcommitted
scsi: smartpqi: Simplify lun_number assignment
Simplify lun_number assignment. lun_number assignment is only required for non-AIO requests. Reviewed-by: Scott Benesh <scott.benesh@microchip.com> Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com> Reviewed-by: Kevin Barnett <kevin.barnett@microchip.com> Signed-off-by: David Strahan <David.Strahan@microchip.com> Signed-off-by: Don Brace <don.brace@microchip.com> Link: https://lore.kernel.org/r/20230824155812.789913-5-don.brace@microchip.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent e9c3911 commit dad662c

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/scsi/smartpqi/smartpqi_init.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5656,7 +5656,6 @@ static int pqi_aio_submit_io(struct pqi_ctrl_info *ctrl_info,
56565656
int rc;
56575657
struct pqi_io_request *io_request;
56585658
struct pqi_aio_path_request *request;
5659-
struct pqi_scsi_dev *device;
56605659

56615660
io_request = pqi_alloc_io_request(ctrl_info, scmd);
56625661
if (!io_request)
@@ -5676,9 +5675,8 @@ static int pqi_aio_submit_io(struct pqi_ctrl_info *ctrl_info,
56765675
request->command_priority = io_high_prio;
56775676
put_unaligned_le16(io_request->index, &request->request_id);
56785677
request->error_index = request->request_id;
5679-
device = scmd->device->hostdata;
5680-
if (!pqi_is_logical_device(device) && ctrl_info->multi_lun_device_supported)
5681-
put_unaligned_le64(((scmd->device->lun) << 8), &request->lun_number);
5678+
if (!raid_bypass && ctrl_info->multi_lun_device_supported)
5679+
put_unaligned_le64(scmd->device->lun << 8, &request->lun_number);
56825680
if (cdb_length > sizeof(request->cdb))
56835681
cdb_length = sizeof(request->cdb);
56845682
request->cdb_length = cdb_length;

0 commit comments

Comments
 (0)