diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h b/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
index 9c96b83042..86b32fe217 100644
--- a/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
+++ b/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
@@ -73,8 +73,7 @@ int16_t WebRtcPcm16b_Encode(int16_t *speech16b,
  * Returned value    : Samples in speechOut16b
  */
 
-int16_t WebRtcPcm16b_DecodeW16(void *inst,
-                               int16_t *speechIn16b,
+int16_t WebRtcPcm16b_DecodeW16(int16_t *speechIn16b,
                                int16_t length_bytes,
                                int16_t *speechOut16b,
                                int16_t* speechType);
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c
index af6720f63a..2c6bea6a90 100644
--- a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c
+++ b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c
@@ -61,8 +61,7 @@ int16_t WebRtcPcm16b_Encode(int16_t *speech16b,
 
 
 /* Decoder with int16_t Input instead of char when the int16_t Encoder is used */
-int16_t WebRtcPcm16b_DecodeW16(void *inst,
-                               int16_t *speechIn16b,
+int16_t WebRtcPcm16b_DecodeW16(int16_t *speechIn16b,
                                int16_t length_bytes,
                                int16_t *speechOut16b,
                                int16_t* speechType)
@@ -80,9 +79,6 @@ int16_t WebRtcPcm16b_DecodeW16(void *inst,
 
     *speechType=1;
 
-    // Avoid warning.
-    (void)(inst = NULL);
-
     return length_bytes >> 1;
 }
 
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
index c3f2f0b179..07b1b4be58 100644
--- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
@@ -82,7 +82,7 @@ int AudioDecoderPcm16B::Decode(const uint8_t* encoded, size_t encoded_len,
                                int16_t* decoded, SpeechType* speech_type) {
   int16_t temp_type = 1;  // Default is speech.
   int16_t ret = WebRtcPcm16b_DecodeW16(
-      state_, reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
+      reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
       static_cast<int16_t>(encoded_len), decoded, &temp_type);
   *speech_type = ConvertSpeechType(temp_type);
   return ret;
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
index c15fa1acd6..400c0b0365 100644
--- a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
@@ -33,7 +33,7 @@ class ExternalPcm16B : public AudioDecoder {
                      int16_t* decoded, SpeechType* speech_type) {
     int16_t temp_type;
     int16_t ret = WebRtcPcm16b_DecodeW16(
-        state_, reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
+        reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
         static_cast<int16_t>(encoded_len), decoded, &temp_type);
     *speech_type = ConvertSpeechType(temp_type);
     return ret;