[PATCH v2] usb: core: remove unnecessary goto in usb_create_newid_files()

Mark Adamenko posted 1 patch 1 month ago
There is a newer version of this series
drivers/usb/core/driver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH v2] usb: core: remove unnecessary goto in usb_create_newid_files()
Posted by Mark Adamenko 1 month ago
The goto to 'exit' only returns the already initialized variable
'error', which would be 0. At that point it could not yet be anything
else. Replacing with an early return 0 removes the
need for the label entirely.

Signed-off-by: Mark Adamenko <marusik.adamenko@gmail.com>
---
v2: fix missing return statement at end of function
---
 drivers/usb/core/driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 2574e65bc640..752ff84a8dc1 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -186,7 +186,7 @@ static int usb_create_newid_files(struct usb_driver *usb_drv)
 	int error = 0;
 
 	if (usb_drv->no_dynamic_id)
-		goto exit;
+		return 0;
 
 	if (usb_drv->probe != NULL) {
 		error = driver_create_file(&usb_drv->driver,
@@ -199,7 +199,7 @@ static int usb_create_newid_files(struct usb_driver *usb_drv)
 						&driver_attr_new_id);
 		}
 	}
-exit:
+
 	return error;
 }
 
-- 
2.53.0
Re: [PATCH v2] usb: core: remove unnecessary goto in usb_create_newid_files()
Posted by Greg KH 1 month ago
On Wed, Mar 04, 2026 at 07:42:16AM -0800, Mark Adamenko wrote:
> The goto to 'exit' only returns the already initialized variable
> 'error', which would be 0. At that point it could not yet be anything
> else. Replacing with an early return 0 removes the
> need for the label entirely.
> 
> Signed-off-by: Mark Adamenko <marusik.adamenko@gmail.com>
> ---
> v2: fix missing return statement at end of function

This is v3 :(