Changeset 49959 in vbox for trunk/src

Timestamp:

Dec 17, 2013 4:06:06 PM (11 years ago)

Author:

vboxsync

Message:

EHCI,OHCI: Cleanup

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -824 +824 @@
 DECLINLINE(int) ohciSetInterruptInt(POHCI ohci, int rcBusy, uint32_t intr, const char *msg)
 {
-    int rc = VINF_SUCCESS;
-
-    rc = PDMCritSectEnter(&ohci->CsIrq, rcBusy);
+    int rc = PDMCritSectEnter(&ohci->CsIrq, rcBusy);
     if (rc != VINF_SUCCESS)
         return rc;
@@ -4132 +4130 @@
     uint32_t res = pThis->intr_status & ~val;
     uint32_t chg = pThis->intr_status ^ res; NOREF(chg);
-    int rc = VINF_SUCCESS;
-
-    rc = PDMCritSectEnter(&pThis->CsIrq, VINF_IOM_R3_MMIO_WRITE);
+
+    int rc = PDMCritSectEnter(&pThis->CsIrq, VINF_IOM_R3_MMIO_WRITE);
     if (rc != VINF_SUCCESS)
         return rc;
@@ -4181 +4178 @@
     uint32_t res = pThis->intr | val;
     uint32_t chg = pThis->intr ^ res; NOREF(chg);
-    int rc = VINF_SUCCESS;
-
-    rc = PDMCritSectEnter(&pThis->CsIrq, VINF_IOM_R3_MMIO_WRITE);
+
+    int rc = PDMCritSectEnter(&pThis->CsIrq, VINF_IOM_R3_MMIO_WRITE);
     if (rc != VINF_SUCCESS)
         return rc;
@@ -4232 +4228 @@
     uint32_t res = pThis->intr & ~val;
     uint32_t chg = pThis->intr ^ res; NOREF(chg);
-    int rc = VINF_SUCCESS;
-
-    rc = PDMCritSectEnter(&pThis->CsIrq, VINF_IOM_R3_MMIO_WRITE);
+
+    int rc = PDMCritSectEnter(&pThis->CsIrq, VINF_IOM_R3_MMIO_WRITE);
     if (rc != VINF_SUCCESS)
         return rc;