From: Jiangshan Yi <yijiangshan@xxxxxxxxxx>
Fix the following coccicheck warning:
drivers/scsi/st.c:1575: WARNING opportunity for max().
drivers/scsi/st.c:2187: WARNING opportunity for min().
drivers/scsi/st.c:3997: WARNING opportunity for min().
drivers/scsi/st.c:4029: WARNING opportunity for min().
min() and max() macro is defined in include/linux/minmax.h. It avoids
multiple evaluations of the arguments when non-constant and performs
strict type-checking.
Signed-off-by: Jiangshan Yi <yijiangshan@xxxxxxxxxx>
---
drivers/scsi/st.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 850172a2b8f1..9555988fa78e 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -1572,8 +1572,7 @@ static int setup_buffering(struct scsi_tape *STp, const char __user *buf,
if (!STbp->do_dio) {
if (STp->block_size)
- bufsize = STp->block_size > st_fixed_buffer_size ?
- STp->block_size : st_fixed_buffer_size;
+ bufsize = max(STp->block_size, st_fixed_buffer_size);
else {
bufsize = count;
/* Make sure that data from previous user is not leaked even if
@@ -2184,8 +2183,7 @@ st_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos)
STps->eof, STbp->buffer_bytes,
(int)(count - total));
) /* end DEB */
- transfer = STbp->buffer_bytes < count - total ?
- STbp->buffer_bytes : count - total;
+ transfer = min((size_t)STbp->buffer_bytes, count - total);
if (!do_dio) {
i = from_buffer(STbp, buf, transfer);
if (i) {
@@ -3994,7 +3992,7 @@ static int append_to_buffer(const char __user *ubp, struct st_buffer * st_bp, in
}
for (; i < st_bp->frp_segs && do_count > 0; i++) {
struct page *page = st_bp->reserved_pages[i];
- cnt = length - offset < do_count ? length - offset : do_count;
+ cnt = min(length - offset, do_count);
res = copy_from_user(page_address(page) + offset, ubp, cnt);
if (res)
return (-EFAULT);
@@ -4026,7 +4024,7 @@ static int from_buffer(struct st_buffer * st_bp, char __user *ubp, int do_count)
}
for (; i < st_bp->frp_segs && do_count > 0; i++) {
struct page *page = st_bp->reserved_pages[i];
- cnt = length - offset < do_count ? length - offset : do_count;
+ cnt = min(length - offset, do_count);
res = copy_to_user(ubp, page_address(page) + offset, cnt);
if (res)
return (-EFAULT);
--
2.25.1
