tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Qianfeng Rong and committed by
Martin K. Petersen 0138c168 b5940fed

+3 -8
+3 -8
drivers/scsi/hpsa.c
··· 2662 2662 case CMD_TARGET_STATUS: 2663 2663 cmd->result |= ei->ScsiStatus; 2664 2664 /* 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)); 2669 2667 if (ei->SenseLen < sense_data_size) 2670 2668 sense_data_size = ei->SenseLen; 2671 2669 memcpy(cmd->sense_buffer, ei->SenseInfo, sense_data_size); ··· 3626 3628 if (rc != 0) 3627 3629 goto exit_unsupported; 3628 3630 pages = buf[3]; 3629 - if ((pages + HPSA_VPD_HEADER_SZ) <= 255) 3630 - bufsize = pages + HPSA_VPD_HEADER_SZ; 3631 - else 3632 - bufsize = 255; 3631 + bufsize = min(pages + HPSA_VPD_HEADER_SZ, 255); 3633 3632 3634 3633 /* Get the whole VPD page list */ 3635 3634 rc = hpsa_scsi_do_inquiry(h, scsi3addr,