Commit fd784cad authored by Guido Kiener's avatar Guido Kiener Committed by Greg Kroah-Hartman
Browse files

usb: usbtmc: Remove redundant code 



Remove redundant code and fix debug messages.

Signed-off-by: default avatarGuido Kiener <guido.kiener@rohde-schwarz.com>
Reviewed-by: default avatarSteve Bayless <steve_bayless@keysight.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dfce4839

drivers/usb/class/usbtmc.c

+8 −17
Original line number Diff line number Diff line
@@ -1745,13 +1745,10 @@ 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);

	if (rv < 0)

		dev_err(&data->usb_dev->dev, "%s returned %d\n", __func__, rv);

	return rv;

}

	return 0;

}



static int usbtmc_ioctl_clear_in_halt(struct usbtmc_device_data *data)

{
@@ -1760,13 +1757,10 @@ 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);

	if (rv < 0)

		dev_err(&data->usb_dev->dev, "%s returned %d\n", __func__, rv);

	return rv;

}

	return 0;

}



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: