]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
usb: usbtmc: Remove unnecessary local variable from usbtmc_ioctl_request
authorThorsten Blum <thorsten.blum@linux.dev>
Thu, 18 Sep 2025 15:13:22 +0000 (17:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Oct 2025 07:11:49 +0000 (09:11 +0200)
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@linux.dev>
Link: https://lore.kernel.org/r/20250918151328.331015-1-thorsten.blum@linux.dev
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/class/usbtmc.c

index 75de29725a450cd17ad8f6da8794d7f619bd0c27..206f1b738ed3a0e178ee813ebf6ad75d233f5894 100644 (file)
@@ -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;
        }