Commit 416dace6 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: core: Use min() instead of open-coding it 



Use min() instead of open-coding it in scsi_normalize_sense().

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Cc: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20230518193159.1166304-2-bvanassche@acm.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f047d1e3

drivers/scsi/scsi_common.c

+1 −2
Original line number Diff line number Diff line
@@ -219,8 +219,7 @@ bool scsi_normalize_sense(const u8 *sense_buffer, int sb_len, 
		if (sb_len > 2)

			sshdr->sense_key = (sense_buffer[2] & 0xf);

		if (sb_len > 7) {

			sb_len = (sb_len < (sense_buffer[7] + 8)) ?

					 sb_len : (sense_buffer[7] + 8);

			sb_len = min(sb_len, sense_buffer[7] + 8);

			if (sb_len > 12)

				sshdr->asc = sense_buffer[12];

			if (sb_len > 13)