Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: echo: remove unneeded USE_SSE2 defines

This define is never set in the kernel, so remove the code
using it.

Cc: David Rowe <david@rowetel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+3 -36
+3 -36
drivers/staging/echo/fir.h
··· 102 102 fir->taps = taps; 103 103 fir->curr_pos = taps - 1; 104 104 fir->coeffs = coeffs; 105 - #if defined(USE_SSE2) || defined(__bfin__) 105 + #if defined(__bfin__) 106 106 fir->history = kcalloc(2 * taps, sizeof(int16_t), GFP_KERNEL); 107 107 #else 108 108 fir->history = kcalloc(taps, sizeof(int16_t), GFP_KERNEL); ··· 112 112 113 113 static inline void fir16_flush(struct fir16_state_t *fir) 114 114 { 115 - #if defined(USE_SSE2) || defined(__bfin__) 115 + #if defined(__bfin__) 116 116 memset(fir->history, 0, 2 * fir->taps * sizeof(int16_t)); 117 117 #else 118 118 memset(fir->history, 0, fir->taps * sizeof(int16_t)); ··· 154 154 static inline int16_t fir16(struct fir16_state_t *fir, int16_t sample) 155 155 { 156 156 int32_t y; 157 - #if defined(USE_SSE2) 158 - int i; 159 - union xmm_t *xmm_coeffs; 160 - union xmm_t *xmm_hist; 161 - 162 - fir->history[fir->curr_pos] = sample; 163 - fir->history[fir->curr_pos + fir->taps] = sample; 164 - 165 - xmm_coeffs = (union xmm_t *)fir->coeffs; 166 - xmm_hist = (union xmm_t *)&fir->history[fir->curr_pos]; 167 - i = fir->taps; 168 - pxor_r2r(xmm4, xmm4); 169 - /* 16 samples per iteration, so the filter must be a multiple of 16 long. */ 170 - while (i > 0) { 171 - movdqu_m2r(xmm_coeffs[0], xmm0); 172 - movdqu_m2r(xmm_coeffs[1], xmm2); 173 - movdqu_m2r(xmm_hist[0], xmm1); 174 - movdqu_m2r(xmm_hist[1], xmm3); 175 - xmm_coeffs += 2; 176 - xmm_hist += 2; 177 - pmaddwd_r2r(xmm1, xmm0); 178 - pmaddwd_r2r(xmm3, xmm2); 179 - paddd_r2r(xmm0, xmm4); 180 - paddd_r2r(xmm2, xmm4); 181 - i -= 16; 182 - } 183 - movdqa_r2r(xmm4, xmm0); 184 - psrldq_i2r(8, xmm0); 185 - paddd_r2r(xmm0, xmm4); 186 - movdqa_r2r(xmm4, xmm0); 187 - psrldq_i2r(4, xmm0); 188 - paddd_r2r(xmm0, xmm4); 189 - movd_r2m(xmm4, y); 190 - #elif defined(__bfin__) 157 + #if defined(__bfin__) 191 158 fir->history[fir->curr_pos] = sample; 192 159 fir->history[fir->curr_pos + fir->taps] = sample; 193 160 y = dot_asm((int16_t *) fir->coeffs, &fir->history[fir->curr_pos],