usb: usbtmc: Remove redundant code

Remove redundant code and fix debug messages.

Signed-off-by: Guido Kiener <guido.kiener@rohde-schwarz.com>
Reviewed-by: Steve Bayless <steve_bayless@keysight.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 72867a97ec00003b7fdd108cd6b88f22dfcdc039..5b6cdb1237ab77e898b0cc3437e4ff2dac554274 100644 (file)
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -1745,12 +1745,9 @@ static int usbtmc_ioctl_clear_out_halt(struct usbtmc_device_data *data)
        rv = usb_clear_halt(data->usb_dev,
                            usb_sndbulkpipe(data->usb_dev, data->bulk_out));
 
-       if (rv < 0) {
-               dev_err(&data->usb_dev->dev, "usb_control_msg returned %d\n",
-                       rv);
-               return rv;
-       }
-       return 0;
+       if (rv < 0)
+               dev_err(&data->usb_dev->dev, "%s returned %d\n", __func__, rv);
+       return rv;
 }
 
 static int usbtmc_ioctl_clear_in_halt(struct usbtmc_device_data *data)
@@ -1760,12 +1757,9 @@ static int usbtmc_ioctl_clear_in_halt(struct usbtmc_device_data *data)
        rv = usb_clear_halt(data->usb_dev,
                            usb_rcvbulkpipe(data->usb_dev, data->bulk_in));
 
-       if (rv < 0) {
-               dev_err(&data->usb_dev->dev, "usb_control_msg returned %d\n",
-                       rv);
-               return rv;
-       }
-       return 0;
+       if (rv < 0)
+               dev_err(&data->usb_dev->dev, "%s returned %d\n", __func__, rv);
+       return rv;
 }
 
 static int usbtmc_ioctl_cancel_io(struct usbtmc_file_data *file_data)
@@ -2189,11 +2183,8 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                break;
 
        case USBTMC488_IOCTL_GET_CAPS:
-               retval = copy_to_user((void __user *)arg,
-                               &data->usb488_caps,
-                               sizeof(data->usb488_caps));
-               if (retval)
-                       retval = -EFAULT;
+               retval = put_user(data->usb488_caps,
+                                 (unsigned char __user *)arg);
                break;
 
        case USBTMC488_IOCTL_READ_STB: