diff mbox series

[03/10] USB: core: message.c: use usb_control_msg_send() in a few places

Message ID 20200902110115.1994491-4-gregkh@linuxfoundation.org (mailing list archive)
State New, archived
Headers show
Series USB: new USB control message helper functions | expand

Commit Message

Greg KH Sept. 2, 2020, 11:01 a.m. UTC 
There are a few calls to usb_control_msg() that can be converted to use
usb_control_msg_send() instead, so do that in order to make the error
checking a bit simpler.

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/usb/core/message.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

Comments

Andy Shevchenko Sept. 2, 2020, 11:23 a.m. UTC | #1 
On Wed, Sep 02, 2020 at 01:01:05PM +0200, Greg Kroah-Hartman wrote:
> There are a few calls to usb_control_msg() that can be converted to use
> usb_control_msg_send() instead, so do that in order to make the error
> checking a bit simpler.

Makes sense. Others will take this as a good example of API in use.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Cc: linux-usb@vger.kernel.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  drivers/usb/core/message.c | 38 +++++++++++++++++++-------------------
>  1 file changed, 19 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
> index 6aa49b237717..dfd079485c76 100644
> --- a/drivers/usb/core/message.c
> +++ b/drivers/usb/core/message.c
> @@ -1081,7 +1081,7 @@ int usb_set_isoch_delay(struct usb_device *dev)
>  	if (dev->speed < USB_SPEED_SUPER)
>  		return 0;
>  
> -	return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
> +	return usb_control_msg_send(dev, 0,
>  			USB_REQ_SET_ISOCH_DELAY,
>  			USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
>  			dev->hub_delay, 0, NULL, 0,
> @@ -1203,13 +1203,13 @@ int usb_clear_halt(struct usb_device *dev, int pipe)
>  	 * (like some ibmcam model 1 units) seem to expect hosts to make
>  	 * this request for iso endpoints, which can't halt!
>  	 */
> -	result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
> -		USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT,
> -		USB_ENDPOINT_HALT, endp, NULL, 0,
> -		USB_CTRL_SET_TIMEOUT);
> +	result = usb_control_msg_send(dev, 0,
> +				      USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT,
> +				      USB_ENDPOINT_HALT, endp, NULL, 0,
> +				      USB_CTRL_SET_TIMEOUT);
>  
>  	/* don't un-halt or force to DATA0 except on success */
> -	if (result < 0)
> +	if (result)
>  		return result;
>  
>  	/* NOTE:  seems like Microsoft and Apple don't bother verifying
> @@ -1558,9 +1558,10 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
>  	if (dev->quirks & USB_QUIRK_NO_SET_INTF)
>  		ret = -EPIPE;
>  	else
> -		ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
> -				   USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE,
> -				   alternate, interface, NULL, 0, 5000);
> +		ret = usb_control_msg_send(dev, 0,
> +					   USB_REQ_SET_INTERFACE,
> +					   USB_RECIP_INTERFACE, alternate,
> +					   interface, NULL, 0, 5000);
>  
>  	/* 9.4.10 says devices don't need this and are free to STALL the
>  	 * request if the interface only has one alternate setting.
> @@ -1570,7 +1571,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
>  			"manual set_interface for iface %d, alt %d\n",
>  			interface, alternate);
>  		manual = 1;
> -	} else if (ret < 0) {
> +	} else if (ret) {
>  		/* Re-instate the old alt setting */
>  		usb_hcd_alloc_bandwidth(dev, NULL, alt, iface->cur_altsetting);
>  		usb_enable_lpm(dev);
> @@ -1718,11 +1719,10 @@ int usb_reset_configuration(struct usb_device *dev)
>  		mutex_unlock(hcd->bandwidth_mutex);
>  		return retval;
>  	}
> -	retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
> -			USB_REQ_SET_CONFIGURATION, 0,
> -			config->desc.bConfigurationValue, 0,
> -			NULL, 0, USB_CTRL_SET_TIMEOUT);
> -	if (retval < 0)
> +	retval = usb_control_msg_send(dev, 0, USB_REQ_SET_CONFIGURATION, 0,
> +				      config->desc.bConfigurationValue, 0,
> +				      NULL, 0, USB_CTRL_SET_TIMEOUT);
> +	if (retval)
>  		goto reset_old_alts;
>  	mutex_unlock(hcd->bandwidth_mutex);
>  
> @@ -2103,10 +2103,10 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
>  	}
>  	kfree(new_interfaces);
>  
> -	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
> -			      USB_REQ_SET_CONFIGURATION, 0, configuration, 0,
> -			      NULL, 0, USB_CTRL_SET_TIMEOUT);
> -	if (ret < 0 && cp) {
> +	ret = usb_control_msg_send(dev, 0, USB_REQ_SET_CONFIGURATION, 0,
> +				   configuration, 0, NULL, 0,
> +				   USB_CTRL_SET_TIMEOUT);
> +	if (ret && cp) {
>  		/*
>  		 * All the old state is gone, so what else can we do?
>  		 * The device is probably useless now anyway.
> -- 
> 2.28.0
>
diff mbox series

Patch

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 6aa49b237717..dfd079485c76 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1081,7 +1081,7 @@  int usb_set_isoch_delay(struct usb_device *dev)
 	if (dev->speed < USB_SPEED_SUPER)
 		return 0;
 
-	return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+	return usb_control_msg_send(dev, 0,
 			USB_REQ_SET_ISOCH_DELAY,
 			USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
 			dev->hub_delay, 0, NULL, 0,
@@ -1203,13 +1203,13 @@  int usb_clear_halt(struct usb_device *dev, int pipe)
 	 * (like some ibmcam model 1 units) seem to expect hosts to make
 	 * this request for iso endpoints, which can't halt!
 	 */
-	result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-		USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT,
-		USB_ENDPOINT_HALT, endp, NULL, 0,
-		USB_CTRL_SET_TIMEOUT);
+	result = usb_control_msg_send(dev, 0,
+				      USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT,
+				      USB_ENDPOINT_HALT, endp, NULL, 0,
+				      USB_CTRL_SET_TIMEOUT);
 
 	/* don't un-halt or force to DATA0 except on success */
-	if (result < 0)
+	if (result)
 		return result;
 
 	/* NOTE:  seems like Microsoft and Apple don't bother verifying
@@ -1558,9 +1558,10 @@  int usb_set_interface(struct usb_device *dev, int interface, int alternate)
 	if (dev->quirks & USB_QUIRK_NO_SET_INTF)
 		ret = -EPIPE;
 	else
-		ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-				   USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE,
-				   alternate, interface, NULL, 0, 5000);
+		ret = usb_control_msg_send(dev, 0,
+					   USB_REQ_SET_INTERFACE,
+					   USB_RECIP_INTERFACE, alternate,
+					   interface, NULL, 0, 5000);
 
 	/* 9.4.10 says devices don't need this and are free to STALL the
 	 * request if the interface only has one alternate setting.
@@ -1570,7 +1571,7 @@  int usb_set_interface(struct usb_device *dev, int interface, int alternate)
 			"manual set_interface for iface %d, alt %d\n",
 			interface, alternate);
 		manual = 1;
-	} else if (ret < 0) {
+	} else if (ret) {
 		/* Re-instate the old alt setting */
 		usb_hcd_alloc_bandwidth(dev, NULL, alt, iface->cur_altsetting);
 		usb_enable_lpm(dev);
@@ -1718,11 +1719,10 @@  int usb_reset_configuration(struct usb_device *dev)
 		mutex_unlock(hcd->bandwidth_mutex);
 		return retval;
 	}
-	retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-			USB_REQ_SET_CONFIGURATION, 0,
-			config->desc.bConfigurationValue, 0,
-			NULL, 0, USB_CTRL_SET_TIMEOUT);
-	if (retval < 0)
+	retval = usb_control_msg_send(dev, 0, USB_REQ_SET_CONFIGURATION, 0,
+				      config->desc.bConfigurationValue, 0,
+				      NULL, 0, USB_CTRL_SET_TIMEOUT);
+	if (retval)
 		goto reset_old_alts;
 	mutex_unlock(hcd->bandwidth_mutex);
 
@@ -2103,10 +2103,10 @@  int usb_set_configuration(struct usb_device *dev, int configuration)
 	}
 	kfree(new_interfaces);
 
-	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-			      USB_REQ_SET_CONFIGURATION, 0, configuration, 0,
-			      NULL, 0, USB_CTRL_SET_TIMEOUT);
-	if (ret < 0 && cp) {
+	ret = usb_control_msg_send(dev, 0, USB_REQ_SET_CONFIGURATION, 0,
+				   configuration, 0, NULL, 0,
+				   USB_CTRL_SET_TIMEOUT);
+	if (ret && cp) {
 		/*
 		 * All the old state is gone, so what else can we do?
 		 * The device is probably useless now anyway.