Patchwork usb: core: Simplify return value of usb_get_configuration()

login
register
mail settings
Submitter Suwan Kim
Date Jan. 7, 2019, 2:21 p.m.
Message ID <20190107142111.10901-1-suwan.kim027@gmail.com>
Download mbox | patch
Permalink /patch/693889/
State New
Headers show

Comments

Suwan Kim - Jan. 7, 2019, 2:21 p.m.
It is better to initialize the return value "result" to -ENOMEM
than to 0. And because "result" takes the return value of
usb_parse_configuration() which returns 0 for success, setting
"result" to 0 at before and after of the for loop is unnecessary.

Signed-off-by: Suwan Kim <suwan.kim027@gmail.com>
---
 drivers/usb/core/config.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Alan Stern - Jan. 7, 2019, 3:10 p.m.
On Mon, 7 Jan 2019, Suwan Kim wrote:

> It is better to initialize the return value "result" to -ENOMEM
> than to 0. And because "result" takes the return value of
> usb_parse_configuration() which returns 0 for success, setting
> "result" to 0 at before and after of the for loop is unnecessary.
> 
> Signed-off-by: Suwan Kim <suwan.kim027@gmail.com>
> ---
>  drivers/usb/core/config.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
> index 7b5cb28ffb35..4a0945c04b4c 100644
> --- a/drivers/usb/core/config.c
> +++ b/drivers/usb/core/config.c
> @@ -800,13 +800,12 @@ int usb_get_configuration(struct usb_device *dev)
>  {
>  	struct device *ddev = &dev->dev;
>  	int ncfg = dev->descriptor.bNumConfigurations;
> -	int result = 0;
> +	int result = -ENOMEM;
>  	unsigned int cfgno, length;
>  	unsigned char *bigbuffer;
>  	struct usb_config_descriptor *desc;
>  
>  	cfgno = 0;
> -	result = -ENOMEM;
>  	if (ncfg > USB_MAXCONFIG) {
>  		dev_warn(ddev, "too many configurations: %d, "
>  		    "using maximum allowed: %d\n", ncfg, USB_MAXCONFIG);
> @@ -832,7 +831,6 @@ int usb_get_configuration(struct usb_device *dev)
>  	if (!desc)
>  		goto err2;
>  
> -	result = 0;
>  	for (; cfgno < ncfg; cfgno++) {
>  		/* We grab just the first descriptor so we know how long
>  		 * the whole configuration is */
> @@ -889,7 +887,6 @@ int usb_get_configuration(struct usb_device *dev)
>  			goto err;
>  		}
>  	}
> -	result = 0;
>  
>  err:
>  	kfree(desc);

Acked-by: Alan Stern <stern@rowland.harvard.edu>

Patch

diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 7b5cb28ffb35..4a0945c04b4c 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -800,13 +800,12 @@  int usb_get_configuration(struct usb_device *dev)
 {
 	struct device *ddev = &dev->dev;
 	int ncfg = dev->descriptor.bNumConfigurations;
-	int result = 0;
+	int result = -ENOMEM;
 	unsigned int cfgno, length;
 	unsigned char *bigbuffer;
 	struct usb_config_descriptor *desc;
 
 	cfgno = 0;
-	result = -ENOMEM;
 	if (ncfg > USB_MAXCONFIG) {
 		dev_warn(ddev, "too many configurations: %d, "
 		    "using maximum allowed: %d\n", ncfg, USB_MAXCONFIG);
@@ -832,7 +831,6 @@  int usb_get_configuration(struct usb_device *dev)
 	if (!desc)
 		goto err2;
 
-	result = 0;
 	for (; cfgno < ncfg; cfgno++) {
 		/* We grab just the first descriptor so we know how long
 		 * the whole configuration is */
@@ -889,7 +887,6 @@  int usb_get_configuration(struct usb_device *dev)
 			goto err;
 		}
 	}
-	result = 0;
 
 err:
 	kfree(desc);