diff --git a/libretro-common/audio/conversion/float_to_s16.c b/libretro-common/audio/conversion/float_to_s16.c
index 260380f0af..801f81640f 100644
--- a/libretro-common/audio/conversion/float_to_s16.c
+++ b/libretro-common/audio/conversion/float_to_s16.c
@@ -50,9 +50,7 @@ void convert_float_s16_asm(int16_t *out, const float *in, size_t samples);
 void convert_float_to_s16(int16_t *out,
       const float *in, size_t samples)
 {
-   int16_t *out_ptr        = NULL;
-   const float *in_ptr     = NULL;
-   size_t i                = 0;
+   size_t i      = 0;
 #if defined(__SSE2__)
    __m128 factor = _mm_set1_ps((float)0x8000);
 
@@ -137,13 +135,10 @@ void convert_float_to_s16(int16_t *out,
 
 #endif
 
-   for (  
-           out_ptr = &out[i], in_ptr = &in[i]
-         ; i < samples
-         ; out_ptr++, in_ptr++, i++)
+   for (; i < samples; i++)
    {
-      int32_t val = (int32_t)(*in_ptr * 0x8000);
-      *out_ptr    = (val > 0x7FFF) ? 0x7FFF :
+      int32_t val = (int32_t)(in[i] * 0x8000);
+      out[i]      = (val > 0x7FFF) ? 0x7FFF :
          (val < -0x8000 ? -0x8000 : (int16_t)val);
    }
 }
diff --git a/libretro-common/audio/conversion/s16_to_float.c b/libretro-common/audio/conversion/s16_to_float.c
index d4ba59ec2f..9ea0cd72cb 100644
--- a/libretro-common/audio/conversion/s16_to_float.c
+++ b/libretro-common/audio/conversion/s16_to_float.c
@@ -50,9 +50,7 @@ void convert_s16_float_asm(float *out, const int16_t *in,
 void convert_s16_to_float(float *out,
       const int16_t *in, size_t samples, float gain)
 {
-   float *out_ptr        = NULL;
-   const int16_t *in_ptr = NULL;
-   unsigned i            = 0;
+   unsigned i      = 0;
 
 #if defined(__SSE2__)
    float fgain   = gain / UINT32_C(0x80000000);
@@ -171,11 +169,8 @@ void convert_s16_to_float(float *out,
 
 #endif
 
-   for (
-           out_ptr = &out[i], in_ptr = &in[i]
-         ; i < samples
-         ; out_ptr++, in_ptr++, i++)
-      *out_ptr = (float)*in_ptr * gain;
+   for (; i < samples; i++)
+      out[i] = (float)in[i] * gain;
 }
 
 /**