Skip to contentSkip to conversation

USB/xHCI: Remove returned value 'status' since never used

PATCH Superseded Mathieu Malaterre 3 participants 4 messages Mar 26, 2019 – Mar 27, 2019 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 USB/xHCI: Remove returned value 'status' since never used

The returned value in status has never been used since commit 4296c70a5ec3 ("USB/xHCI: Enable USB 3.0 hub remote wakeup.") So remove 'status' completely.

Remove warning (W=1):

drivers/usb/core/hub.c:3671:8: warning: variable 'status' set but not used [-Wunused-but-set-variable]

---
 drivers/usb/core/hub.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/usb/core/hub.c +6 -7
index 8d4631c81b9f..15a2934dc29d 100644
@@ -3668,7 +3668,6 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
 	struct usb_hub		*hub = usb_get_intfdata(intf);
 	struct usb_device	*hdev = hub->hdev;
 	unsigned		port1;
-	int			status;
 
 	/*
 	 * Warn if children aren't already suspended.
@@ -3702,12 +3701,12 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
 	if (hub_is_superspeed(hdev) && hdev->do_remote_wakeup) {
 		/* Enable hub to send remote wakeup for all ports. */
 		for (port1 = 1; port1 <= hdev->maxchild; port1++) {
-			status = set_port_feature(hdev,
-					port1 |
-					USB_PORT_FEAT_REMOTE_WAKE_CONNECT |
-					USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT |
-					USB_PORT_FEAT_REMOTE_WAKE_OVER_CURRENT,
-					USB_PORT_FEAT_REMOTE_WAKE_MASK);
+			set_port_feature(hdev,
+					 port1 |
+					 USB_PORT_FEAT_REMOTE_WAKE_CONNECT |
+					 USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT |
+					 USB_PORT_FEAT_REMOTE_WAKE_OVER_CURRENT,
+					 USB_PORT_FEAT_REMOTE_WAKE_MASK);
 		}
 	}
 
#1 lore raw
Quoted 27 lines · Mathieu Malaterre

The returned value in status has never been used since commit 4296c70a5ec3 ("USB/xHCI: Enable USB 3.0 hub remote wakeup.") So remove 'status' completely.

Remove warning (W=1):

drivers/usb/core/hub.c:3671:8: warning: variable 'status' set but not used [-Wunused-but-set-variable]

---
  drivers/usb/core/hub.c | 13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
drivers/usb/core/hub.c +0 -1
index 8d4631c81b9f..15a2934dc29d 100644
@@ -3668,7 +3668,6 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
  	struct usb_hub		*hub = usb_get_intfdata(intf);
  	struct usb_device	*hdev = hub->hdev;
  	unsigned		port1;
-	int			status;
 
  	/*
  	 * Warn if children aren't already suspended.

drivers/usb/core/hub.c static int hub_suspend(struct usb_interface *intf, pm_message_t msg) · line 3710

Quoted 9 lines
drivers/usb/core/hub.c +0 -6
@@ -3702,12 +3701,12 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
  	if (hub_is_superspeed(hdev) && hdev->do_remote_wakeup) {
  		/* Enable hub to send remote wakeup for all ports. */
  		for (port1 = 1; port1 <= hdev->maxchild; port1++) {
-			status = set_port_feature(hdev,
-					port1 |
-					USB_PORT_FEAT_REMOTE_WAKE_CONNECT |
-					USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT |
-					USB_PORT_FEAT_REMOTE_WAKE_OVER_CURRENT,
-					USB_PORT_FEAT_REMOTE_WAKE_MASK);

should not we check return value instead of removing it.

Thanks,
Mukesh

Quoted 9 lines
drivers/usb/core/hub.c +6 -0
+			set_port_feature(hdev,
+					 port1 |
+					 USB_PORT_FEAT_REMOTE_WAKE_CONNECT |
+					 USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT |
+					 USB_PORT_FEAT_REMOTE_WAKE_OVER_CURRENT,
+					 USB_PORT_FEAT_REMOTE_WAKE_MASK);
  		}
  	}
 
#2 lore raw
In reply to Mathieu Malaterre
Quoted 6 lines · Mathieu Malaterre

The returned value in status has never been used since commit 4296c70a5ec3 ("USB/xHCI: Enable USB 3.0 hub remote wakeup.") So remove 'status' completely.

Remove warning (W=1):

Quoted 7 lines

drivers/usb/core/hub.c:3671:8: warning: variable 'status' set but not used [-Wunused-but-set-variable]

---
 drivers/usb/core/hub.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Why do you have xhci in your subject line? Shouldn't it be "USB: hub:"?

Please fix up, thanks.

greg k-h

#3 lore raw

PATCH v2 1/1 USB: hub: Remove returned value 'status' since never used

In reply to Mathieu Malaterre

The returned value in status has never been used since commit 4296c70a5ec3 ("USB/xHCI: Enable USB 3.0 hub remote wakeup.") So remove 'status' completely.

Remove warning (W=1):

drivers/usb/core/hub.c:3671:8: warning: variable 'status' set but not used [-Wunused-but-set-variable]

---
v2: change subject prefix from USB/xHCI: to USB: hub:

 drivers/usb/core/hub.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/usb/core/hub.c +6 -7
index 8d4631c81b9f..15a2934dc29d 100644
@@ -3668,7 +3668,6 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
 	struct usb_hub		*hub = usb_get_intfdata(intf);
 	struct usb_device	*hdev = hub->hdev;
 	unsigned		port1;
-	int			status;
 
 	/*
 	 * Warn if children aren't already suspended.
@@ -3702,12 +3701,12 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
 	if (hub_is_superspeed(hdev) && hdev->do_remote_wakeup) {
 		/* Enable hub to send remote wakeup for all ports. */
 		for (port1 = 1; port1 <= hdev->maxchild; port1++) {
-			status = set_port_feature(hdev,
-					port1 |
-					USB_PORT_FEAT_REMOTE_WAKE_CONNECT |
-					USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT |
-					USB_PORT_FEAT_REMOTE_WAKE_OVER_CURRENT,
-					USB_PORT_FEAT_REMOTE_WAKE_MASK);
+			set_port_feature(hdev,
+					 port1 |
+					 USB_PORT_FEAT_REMOTE_WAKE_CONNECT |
+					 USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT |
+					 USB_PORT_FEAT_REMOTE_WAKE_OVER_CURRENT,
+					 USB_PORT_FEAT_REMOTE_WAKE_MASK);
 		}
 	}