]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
char/adi: Use min_t(size_t,,) in adi_read() + adi_write()
authorThorsten Blum <thorsten.blum@linux.dev>
Mon, 8 Sep 2025 18:13:54 +0000 (20:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Oct 2025 05:53:49 +0000 (07:53 +0200)
Replace min() and manual casting of MAX_BUF_SZ with min_t(size_t,,) in
both adi_read() and adi_write().

This matches the initial buffer size calculation:

ver_buf_sz = min_t(size_t, count, MAX_BUF_SZ);

and makes the code more consistent. No functional changes intended.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://patch.msgid.link/20250908181354.436680-2-thorsten.blum@linux.dev
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/adi.c

index 4312b0cc391cd0ee8ef67ca60f76fe8b60f94ae0..0849d933a2d54d54a272c6b43cd2c00757c52173 100644 (file)
@@ -80,8 +80,8 @@ static ssize_t adi_read(struct file *file, char __user *buf,
                        bytes_read += ver_buf_sz;
                        ver_buf_idx = 0;
 
-                       ver_buf_sz = min(count - bytes_read,
-                                        (size_t)MAX_BUF_SZ);
+                       ver_buf_sz = min_t(size_t, count - bytes_read,
+                                          MAX_BUF_SZ);
                }
        }
 
@@ -157,7 +157,7 @@ static ssize_t adi_write(struct file *file, const char __user *buf,
                }
 
                bytes_written += ver_buf_sz;
-               ver_buf_sz = min(count - bytes_written, (size_t)MAX_BUF_SZ);
+               ver_buf_sz = min_t(size_t, count - bytes_written, MAX_BUF_SZ);
        } while (bytes_written < count);
 
        (*offp) += bytes_written;