[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20250918151328.331015-1-thorsten.blum@linux.dev>
Date: Thu, 18 Sep 2025 17:13:22 +0200
From: Thorsten Blum <thorsten.blum@...ux.dev>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Dave Penkler <dpenkler@...il.com>,
Oliver Neukum <oneukum@...e.com>
Cc: Thorsten Blum <thorsten.blum@...ux.dev>,
linux-usb@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] usb: usbtmc: Remove unnecessary local variable from usbtmc_ioctl_request
The local variable 'res' is only used to temporary store the results of
calling copy_from_user() and copy_to_user(). Use the results directly
and remove the local variable.
Signed-off-by: Thorsten Blum <thorsten.blum@...ux.dev>
---
drivers/usb/class/usbtmc.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 75de29725a45..206f1b738ed3 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -1936,10 +1936,8 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data,
u8 *buffer = NULL;
int rv;
unsigned int is_in, pipe;
- unsigned long res;
- res = copy_from_user(&request, arg, sizeof(struct usbtmc_ctrlrequest));
- if (res)
+ if (copy_from_user(&request, arg, sizeof(struct usbtmc_ctrlrequest)))
return -EFAULT;
if (request.req.wLength > USBTMC_BUFSIZE)
@@ -1956,9 +1954,8 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data,
if (!is_in) {
/* Send control data to device */
- res = copy_from_user(buffer, request.data,
- request.req.wLength);
- if (res) {
+ if (copy_from_user(buffer, request.data,
+ request.req.wLength)) {
rv = -EFAULT;
goto exit;
}
@@ -1984,8 +1981,7 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data,
if (rv && is_in) {
/* Read control data from device */
- res = copy_to_user(request.data, buffer, rv);
- if (res)
+ if (copy_to_user(request.data, buffer, rv))
rv = -EFAULT;
}
--
2.51.0
Powered by blists - more mailing lists