3 files changed, 6 insertions, 12 deletions
diff --git a/devices/src/usb/host_backend/host_backend_device_provider.rs b/devices/src/usb/host_backend/host_backend_device_provider.rs
index 8aca33e..9e3f199 100644
--- a/devices/src/usb/host_backend/host_backend_device_provider.rs
+++ b/devices/src/usb/host_backend/host_backend_device_provider.rs
@@ -78,7 +78,7 @@ impl HostBackendDeviceProvider {
                 *self = HostBackendDeviceProvider::Started { inner };
                 Ok(())
             }
-            HostBackendDeviceProvider::Started { inner: _ } => {
+            HostBackendDeviceProvider::Started { .. } => {
                 error!("Host backend provider has already started");
                 Err(Error::BadBackendProviderState)
             }
diff --git a/devices/src/usb/host_backend/utils.rs b/devices/src/usb/host_backend/utils.rs
index 6ae0388..7d23bd4 100644
--- a/devices/src/usb/host_backend/utils.rs
+++ b/devices/src/usb/host_backend/utils.rs
@@ -31,7 +31,7 @@ pub fn update_transfer_state<T: UsbTransferBuffer>(
         XhciTransferState::Cancelling => {
             *state = XhciTransferState::Cancelled;
         }
-        XhciTransferState::Submitted { cancel_callback: _ } => {
+        XhciTransferState::Submitted { .. } => {
             *state = XhciTransferState::Completed;
         }
         _ => {
diff --git a/devices/src/usb/xhci/xhci_controller.rs b/devices/src/usb/xhci/xhci_controller.rs
index 3f2db74..03f2cfc 100644
--- a/devices/src/usb/xhci/xhci_controller.rs
+++ b/devices/src/usb/xhci/xhci_controller.rs
@@ -234,12 +234,8 @@ impl PciDevice for XhciController {
         if addr < bar0 || addr > bar0 + XHCI_BAR0_SIZE {
             return;
         }
-        match self.state {
-            XhciControllerState::Initialized {
-                ref mmio,
-                xhci: _,
-                fail_handle: _,
-            } => {
+        match &self.state {
+            XhciControllerState::Initialized { mmio, .. } => {
                 // Read bar would still work even if it's already failed.
                 mmio.read(addr - bar0, data);
             }
@@ -255,11 +251,9 @@ impl PciDevice for XhciController {
         if addr < bar0 || addr > bar0 + XHCI_BAR0_SIZE {
             return;
         }
-        match self.state {
+        match &self.state {
             XhciControllerState::Initialized {
-                ref mmio,
-                xhci: _,
-                ref fail_handle,
+                mmio, fail_handle, ..
             } => {
                 if !fail_handle.failed() {
                     mmio.write(addr - bar0, data);