[PATCH 4/4] host-libusb: Remove unused variable

mrezanin@redhat.com posted 4 patches 3 years, 3 months ago
Maintainers: Jason Wang <jasowang@redhat.com>, Sven Schnelle <svens@stackframe.org>, Gerd Hoffmann <kraxel@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>
[PATCH 4/4] host-libusb: Remove unused variable
Posted by mrezanin@redhat.com 3 years, 3 months ago
From: Miroslav Rezanina <mrezanin@redhat.com>

Variable unconnected used in usb_host_auto_check function is only incremented
but never read as line where it is read was disabled since introducing the code.
This causes 'Unused but set variable' warning on Clang 15.0.1 compiler.

Removing the variable and disabled code to prevent the warning.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
 hw/usb/host-libusb.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 28f8af8941..176868d345 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -1837,7 +1837,6 @@ static void usb_host_auto_check(void *unused)
     struct USBAutoFilter *f;
     libusb_device **devs = NULL;
     struct libusb_device_descriptor ddesc;
-    int unconnected = 0;
     int i, n;
 
     if (usb_host_init() != 0) {
@@ -1897,9 +1896,6 @@ static void usb_host_auto_check(void *unused)
         libusb_free_device_list(devs, 1);
 
         QTAILQ_FOREACH(s, &hostdevs, next) {
-            if (s->dh == NULL) {
-                unconnected++;
-            }
             if (s->seen == 0) {
                 if (s->dh) {
                     usb_host_close(s);
@@ -1908,17 +1904,6 @@ static void usb_host_auto_check(void *unused)
             }
             s->seen = 0;
         }
-
-#if 0
-        if (unconnected == 0) {
-            /* nothing to watch */
-            if (usb_auto_timer) {
-                timer_del(usb_auto_timer);
-                trace_usb_host_auto_scan_disabled();
-            }
-            return;
-        }
-#endif
     }
 
     if (!usb_vmstate) {
-- 
2.31.1
Re: [PATCH 4/4] host-libusb: Remove unused variable
Posted by Thomas Huth 3 years, 3 months ago
On 09/11/2022 16.57, mrezanin@redhat.com wrote:
> From: Miroslav Rezanina <mrezanin@redhat.com>
> 
> Variable unconnected used in usb_host_auto_check function is only incremented
> but never read as line where it is read was disabled since introducing the code.
> This causes 'Unused but set variable' warning on Clang 15.0.1 compiler.
> 
> Removing the variable and disabled code to prevent the warning.
> 
> Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
> ---
>   hw/usb/host-libusb.c | 15 ---------------
>   1 file changed, 15 deletions(-)
> 
> diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
> index 28f8af8941..176868d345 100644
> --- a/hw/usb/host-libusb.c
> +++ b/hw/usb/host-libusb.c
> @@ -1837,7 +1837,6 @@ static void usb_host_auto_check(void *unused)
>       struct USBAutoFilter *f;
>       libusb_device **devs = NULL;
>       struct libusb_device_descriptor ddesc;
> -    int unconnected = 0;
>       int i, n;
>   
>       if (usb_host_init() != 0) {
> @@ -1897,9 +1896,6 @@ static void usb_host_auto_check(void *unused)
>           libusb_free_device_list(devs, 1);
>   
>           QTAILQ_FOREACH(s, &hostdevs, next) {
> -            if (s->dh == NULL) {
> -                unconnected++;
> -            }
>               if (s->seen == 0) {
>                   if (s->dh) {
>                       usb_host_close(s);
> @@ -1908,17 +1904,6 @@ static void usb_host_auto_check(void *unused)
>               }
>               s->seen = 0;
>           }
> -
> -#if 0
> -        if (unconnected == 0) {
> -            /* nothing to watch */
> -            if (usb_auto_timer) {
> -                timer_del(usb_auto_timer);
> -                trace_usb_host_auto_scan_disabled();
> -            }
> -            return;
> -        }
> -#endif
>       }
>   
>       if (!usb_vmstate) {

Reviewed-by: Thomas Huth <thuth@redhat.com>