Index: /trunk/include/VBox/vmm/pdmdev.h
===================================================================
--- /trunk/include/VBox/vmm/pdmdev.h	(revision 60405)
+++ /trunk/include/VBox/vmm/pdmdev.h	(revision 60406)
@@ -3677,5 +3677,5 @@
      * @thread  EMT(0)
      */
-    DECLR3CALLBACKMEMBER(int, pfnFirmwareRegister,(PPDMDEVINS pDevIns, PCPDMFWREG pFwReg, PCPDMFWHLPR3 *ppFwHlpR3));
+    DECLR3CALLBACKMEMBER(int, pfnFirmwareRegister,(PPDMDEVINS pDevIns, PCPDMFWREG pFwReg, PCPDMFWHLPR3 *ppFwHlp));
 
     /**
@@ -5392,7 +5392,7 @@
  * @copydoc PDMDEVHLPR3::pfnFirmwareRegister
  */
-DECLINLINE(int) PDMDevHlpFirmwareRegister(PPDMDEVINS pDevIns, PCPDMFWREG pFwReg, PCPDMFWHLPR3 *ppFwHlpR3)
-{
-    return pDevIns->pHlpR3->pfnFirmwareRegister(pDevIns, pFwReg, ppFwHlpR3);
+DECLINLINE(int) PDMDevHlpFirmwareRegister(PPDMDEVINS pDevIns, PCPDMFWREG pFwReg, PCPDMFWHLPR3 *ppFwHlp)
+{
+    return pDevIns->pHlpR3->pfnFirmwareRegister(pDevIns, pFwReg, ppFwHlp);
 }
 
Index: /trunk/src/VBox/VMM/VMMR3/HM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/HM.cpp	(revision 60405)
+++ /trunk/src/VBox/VMM/VMMR3/HM.cpp	(revision 60406)
@@ -1107,5 +1107,5 @@
  * @callback_method_impl{FNPDMVMMDEVHEAPNOTIFY}
  */
-static DECLCALLBACK(void) hmR3VmmDevHeapNotify(PVM pVM, void *pvAllocation,  RTGCPHYS GCPhysAllocation)
+static DECLCALLBACK(void) hmR3VmmDevHeapNotify(PVM pVM, void *pvAllocation, RTGCPHYS GCPhysAllocation)
 {
     NOREF(pVM);
Index: /trunk/src/VBox/VMM/VMMR3/VM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/VM.cpp	(revision 60405)
+++ /trunk/src/VBox/VMM/VMMR3/VM.cpp	(revision 60406)
@@ -3030,8 +3030,8 @@
  *
  * @returns VBox status code.
- * @param   pUVM    The VM to reset.
+ * @param   pVM             The cross context VM structure.
  * @thread  EMT
  *
- * @remarks Caller is expected to clear the reset FF.
+ * @remarks Caller is expected to clear the VM_FF_RESET force flag.
  */
 VMMR3_INT_DECL(VBOXSTRICTRC) VMR3ResetFF(PVM pVM)
@@ -3056,5 +3056,5 @@
  *
  * @returns VBox status code.
- * @param   pUVM    The VM to reset.
+ * @param   pVM             The cross context VM structure.
  * @thread  EMT
  */