Skip to content

Commit 0138c16

Browse files
qianfengrongmartinkpetersen
authored andcommitted
scsi: hpsa: use min()/min_t() to improve code
Use min()/min_t() to reduce the code in complete_scsi_command() and hpsa_vpd_page_supported(), and improve readability. Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com> Link: https://lore.kernel.org/r/20250815121609.384914-3-rongqianfeng@vivo.com Acked-by: Don Brace <don.brace@microchip.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent b5940fe commit 0138c16

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

drivers/scsi/hpsa.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2662,10 +2662,8 @@ static void complete_scsi_command(struct CommandList *cp)
26622662
case CMD_TARGET_STATUS:
26632663
cmd->result |= ei->ScsiStatus;
26642664
/* copy the sense data */
2665-
if (SCSI_SENSE_BUFFERSIZE < sizeof(ei->SenseInfo))
2666-
sense_data_size = SCSI_SENSE_BUFFERSIZE;
2667-
else
2668-
sense_data_size = sizeof(ei->SenseInfo);
2665+
sense_data_size = min_t(unsigned long, SCSI_SENSE_BUFFERSIZE,
2666+
sizeof(ei->SenseInfo));
26692667
if (ei->SenseLen < sense_data_size)
26702668
sense_data_size = ei->SenseLen;
26712669
memcpy(cmd->sense_buffer, ei->SenseInfo, sense_data_size);
@@ -3628,10 +3626,7 @@ static bool hpsa_vpd_page_supported(struct ctlr_info *h,
36283626
if (rc != 0)
36293627
goto exit_unsupported;
36303628
pages = buf[3];
3631-
if ((pages + HPSA_VPD_HEADER_SZ) <= 255)
3632-
bufsize = pages + HPSA_VPD_HEADER_SZ;
3633-
else
3634-
bufsize = 255;
3629+
bufsize = min(pages + HPSA_VPD_HEADER_SZ, 255);
36353630

36363631
/* Get the whole VPD page list */
36373632
rc = hpsa_scsi_do_inquiry(h, scsi3addr,

0 commit comments

Comments
 (0)