Index: /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 82355)
+++ /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 82356)
@@ -677,6 +677,4 @@
 DECLINLINE(PAUDMIXSINK) ichac97R3IndexToSink(PAC97STATE pThis, uint8_t uIndex)
 {
-    AssertPtrReturn(pThis, NULL);
-
     switch (uIndex)
     {
@@ -811,7 +809,4 @@
 static bool ichac97R3StreamIsEnabled(PAC97STATE pThis, PAC97STREAM pStream)
 {
-    AssertPtrReturn(pThis,   false);
-    AssertPtrReturn(pStream, false);
-
     PAUDMIXSINK pSink = ichac97R3IndexToSink(pThis, pStream->u8SD);
     bool fIsEnabled = RT_BOOL(AudioMixerSinkGetStatus(pSink) & AUDMIXSINK_STS_RUNNING);
@@ -832,7 +827,4 @@
 static int ichac97R3StreamEnable(PAC97STATE pThis, PAC97STREAM pStream, bool fEnable)
 {
-    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-
     ichac97R3StreamLock(pStream);
 
@@ -900,7 +892,4 @@
 static void ichac97R3StreamReset(PAC97STATE pThis, PAC97STREAM pStream)
 {
-    AssertPtrReturnVoid(pThis);
-    AssertPtrReturnVoid(pStream);
-
     ichac97R3StreamLock(pStream);
 
@@ -937,6 +926,4 @@
 {
     RT_NOREF(pThis);
-    AssertPtrReturn(pStream, VERR_INVALID_PARAMETER);
-    /** @todo Validate u8Strm. */
 
     LogFunc(("[SD%RU8] pStream=%p\n", u8SD, pStream));
@@ -1090,7 +1077,5 @@
 {
     RT_NOREF(pThis);
-    AssertPtrReturn(pDstStream,  VERR_INVALID_POINTER);
-    AssertPtrReturn(pSrcMixSink, VERR_INVALID_POINTER);
-    AssertReturn(cbToWrite,      VERR_INVALID_PARAMETER);
+    AssertReturn(cbToWrite > 0,  VERR_INVALID_PARAMETER);
     /* pcbWritten is optional. */
 
@@ -1136,7 +1121,5 @@
 {
     RT_NOREF(pThis);
-    AssertPtrReturn(pSrcStream,  VERR_INVALID_POINTER);
-    AssertPtrReturn(pDstMixSink, VERR_INVALID_POINTER);
-    AssertReturn(cbToRead,       VERR_INVALID_PARAMETER);
+    AssertReturn(cbToRead > 0, VERR_INVALID_PARAMETER);
     /* pcbRead is optional. */
 
@@ -1700,7 +1683,5 @@
 static int ichac97R3MixerAddDrvStream(PAC97STATE pThis, PAUDMIXSINK pMixSink, PPDMAUDIOSTREAMCFG pCfg, PAC97DRIVER pDrv)
 {
-    AssertPtrReturn(pThis,    VERR_INVALID_POINTER);
     AssertPtrReturn(pMixSink, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg,     VERR_INVALID_POINTER);
 
     PPDMAUDIOSTREAMCFG pStreamCfg = DrvAudioHlpStreamCfgDup(pCfg);
@@ -1783,7 +1764,5 @@
 static int ichac97R3MixerAddDrvStreams(PAC97STATE pThis, PAUDMIXSINK pMixSink, PPDMAUDIOSTREAMCFG pCfg)
 {
-    AssertPtrReturn(pThis,    VERR_INVALID_POINTER);
     AssertPtrReturn(pMixSink, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg,     VERR_INVALID_POINTER);
 
     if (!DrvAudioHlpStreamCfgIsValid(pCfg))
@@ -1856,7 +1835,4 @@
 static void ichac97R3MixerRemoveDrv(PAC97STATE pThis, PAC97DRIVER pDrv)
 {
-    AssertPtrReturnVoid(pThis);
-    AssertPtrReturnVoid(pDrv);
-
     if (pDrv->MicIn.pMixStrm)
     {
@@ -1901,7 +1877,4 @@
                                           PDMAUDIODIR enmDir, PDMAUDIODSTSRCUNION dstSrc, PAC97DRIVER pDrv)
 {
-    AssertPtrReturnVoid(pThis);
-    AssertPtrReturnVoid(pMixSink);
-
     PAC97DRIVERSTREAM pDrvStream = ichac97R3MixerGetDrvStream(pThis, pDrv, enmDir, dstSrc);
     if (pDrvStream)
@@ -1928,5 +1901,4 @@
                                            PDMAUDIODIR enmDir, PDMAUDIODSTSRCUNION dstSrc)
 {
-    AssertPtrReturnVoid(pThis);
     AssertPtrReturnVoid(pMixSink);
 
@@ -2153,5 +2125,4 @@
 static void ichac97R3StreamLock(PAC97STREAM pStream)
 {
-    AssertPtrReturnVoid(pStream);
     int rc2 = RTCritSectEnter(&pStream->State.CritSect);
     AssertRC(rc2);
@@ -2166,5 +2137,4 @@
 static void ichac97R3StreamUnlock(PAC97STREAM pStream)
 {
-    AssertPtrReturnVoid(pStream);
     int rc2 = RTCritSectLeave(&pStream->State.CritSect);
     AssertRC(rc2);
@@ -2179,6 +2149,4 @@
 static uint32_t ichac97R3StreamGetUsed(PAC97STREAM pStream)
 {
-    AssertPtrReturn(pStream, 0);
-
     if (!pStream->State.pCircBuf)
         return 0;
@@ -2195,6 +2163,4 @@
 static uint32_t ichac97R3StreamGetFree(PAC97STREAM pStream)
 {
-    AssertPtrReturn(pStream, 0);
-
     if (!pStream->State.pCircBuf)
         return 0;
@@ -2493,6 +2459,4 @@
 static int ichac97R3MixerReset(PAC97STATE pThis)
 {
-    AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
-
     LogFlowFuncEnter();
 
@@ -2668,7 +2632,4 @@
 static int ichac97R3StreamTransfer(PPDMDEVINS pDevIns, PAC97STATE pThis, PAC97STREAM pStream, uint32_t cbToProcessMax)
 {
-    AssertPtrReturn(pThis,       VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream,     VERR_INVALID_POINTER);
-
     if (!cbToProcessMax)
         return VINF_SUCCESS;
