From: Deepak R Varma <drv@mailo.com>
To: "Kai Mäkisara" <Kai.Makisara@kolumbus.fi>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Saurabh Singh Sengar <ssengar@microsoft.com>,
Praveen Kumar <kumarpraveen@linux.microsoft.com>,
Deepak R Varma <drv@mailo.com>
Subject: [PATCH] scsi: st: Use min/max helpers for comparison and assignment
Date: Sat, 28 Jan 2023 13:28:48 +0530 [thread overview]
Message-ID: <Y9TVuM1az7ajhTlS@ubun2204.myguest.virtualbox.org> (raw)
Simplify code by using min_t helper macro for logical evaluation
and value assignment. Use the _t variant of min macro since the
variable types are not same.
This issue is identified by coccicheck using the minmax.cocci file.
Signed-off-by: Deepak R Varma <drv@mailo.com>
---
Please note: Proposed change is only compile/build tested.
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 b90a440e135d..38aa59cba110 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -1574,8 +1574,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
@@ -2186,8 +2185,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_t(size_t, STbp->buffer_bytes, (count - total));
if (!do_dio) {
i = from_buffer(STbp, buf, transfer);
if (i) {
@@ -3996,7 +3994,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);
@@ -4028,7 +4026,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.34.1
reply other threads:[~2023-01-28 7:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y9TVuM1az7ajhTlS@ubun2204.myguest.virtualbox.org \
--to=drv@mailo.com \
--cc=Kai.Makisara@kolumbus.fi \
--cc=jejb@linux.ibm.com \
--cc=kumarpraveen@linux.microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ssengar@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.