Staging: echo: remove unneeded USE_MMX defines

This define is never set in the kernel, so remove the code
using it.  This lets us drop the mmx.h file as well.

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

diff --git a/drivers/staging/echo/fir.h b/drivers/staging/echo/fir.h
index ac6c553e89f2993ff7b2a3752eee4e6e5f3f9f35..2c182fe8ddcde15fe23d01b788dd13d0526d16d9 100644 (file)
--- a/drivers/staging/echo/fir.h
+++ b/drivers/staging/echo/fir.h
@@ -62,10 +62,6 @@
    can.
 */
 
-#if defined(USE_MMX)  ||  defined(USE_SSE2)
-#include "mmx.h"
-#endif
-
 /*!
     16 bit integer FIR descriptor. This defines the working state for a single
     instance of an FIR filter using 16 bit integer coefficients.
@@ -106,7 +102,7 @@ static inline const int16_t *fir16_create(struct fir16_state_t *fir,
        fir->taps = taps;
        fir->curr_pos = taps - 1;
        fir->coeffs = coeffs;
-#if defined(USE_MMX)  ||  defined(USE_SSE2) || defined(__bfin__)
+#if defined(USE_SSE2) || defined(__bfin__)
        fir->history = kcalloc(2 * taps, sizeof(int16_t), GFP_KERNEL);
 #else
        fir->history = kcalloc(taps, sizeof(int16_t), GFP_KERNEL);
@@ -116,7 +112,7 @@ static inline const int16_t *fir16_create(struct fir16_state_t *fir,
 
 static inline void fir16_flush(struct fir16_state_t *fir)
 {
-#if defined(USE_MMX)  ||  defined(USE_SSE2) || defined(__bfin__)
+#if defined(USE_SSE2) || defined(__bfin__)
        memset(fir->history, 0, 2 * fir->taps * sizeof(int16_t));
 #else
        memset(fir->history, 0, fir->taps * sizeof(int16_t));
@@ -158,38 +154,7 @@ static inline int32_t dot_asm(short *x, short *y, int len)
 static inline int16_t fir16(struct fir16_state_t *fir, int16_t sample)
 {
        int32_t y;
-#if defined(USE_MMX)
-       int i;
-       union mmx_t *mmx_coeffs;
-       union mmx_t *mmx_hist;
-
-       fir->history[fir->curr_pos] = sample;
-       fir->history[fir->curr_pos + fir->taps] = sample;
-
-       mmx_coeffs = (union mmx_t *)fir->coeffs;
-       mmx_hist = (union mmx_t *)&fir->history[fir->curr_pos];
-       i = fir->taps;
-       pxor_r2r(mm4, mm4);
-       /* 8 samples per iteration, so the filter must be a multiple of 8 long. */
-       while (i > 0) {
-               movq_m2r(mmx_coeffs[0], mm0);
-               movq_m2r(mmx_coeffs[1], mm2);
-               movq_m2r(mmx_hist[0], mm1);
-               movq_m2r(mmx_hist[1], mm3);
-               mmx_coeffs += 2;
-               mmx_hist += 2;
-               pmaddwd_r2r(mm1, mm0);
-               pmaddwd_r2r(mm3, mm2);
-               paddd_r2r(mm0, mm4);
-               paddd_r2r(mm2, mm4);
-               i -= 8;
-       }
-       movq_r2r(mm4, mm0);
-       psrlq_i2r(32, mm0);
-       paddd_r2r(mm0, mm4);
-       movd_r2m(mm4, y);
-       emms();
-#elif defined(USE_SSE2)
+#if defined(USE_SSE2)
        int i;
        union xmm_t *xmm_coeffs;
        union xmm_t *xmm_hist;

diff --git a/drivers/staging/echo/mmx.h b/drivers/staging/echo/mmx.h
deleted file mode 100644 (file)
index c1dcd72..0000000
--- a/drivers/staging/echo/mmx.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * mmx.h
- * Copyright (C) 1997-2001 H. Dietz and R. Fisher
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef AVCODEC_I386MMX_H
-#define AVCODEC_I386MMX_H
-
-/*
- * The type of an value that fits in an MMX register (note that long
- * long constant values MUST be suffixed by LL and unsigned long long
- * values by ULL, lest they be truncated by the compiler)
- */
-
-union mmx_t {
-       long long q;            /* Quadword (64-bit) value */
-       unsigned long long uq;  /* Unsigned Quadword */
-       int d[2];               /* 2 Doubleword (32-bit) values */
-       unsigned int ud[2];     /* 2 Unsigned Doubleword */
-       short w[4];             /* 4 Word (16-bit) values */
-       unsigned short uw[4];   /* 4 Unsigned Word */
-       char b[8];              /* 8 Byte (8-bit) values */
-       unsigned char ub[8];    /* 8 Unsigned Byte */
-       float s[2];             /* Single-precision (32-bit) value */
-};                             /* On an 8-byte (64-bit) boundary */
-
-/* SSE registers */
-union xmm_t {
-       char b[16];
-};
-
-#define        mmx_i2r(op, imm, reg) \
-       __asm__ __volatile__ (#op " %0, %%" #reg \
-                               : /* nothing */ \
-                               : "i" (imm))
-
-#define        mmx_m2r(op, mem, reg) \
-       __asm__ __volatile__ (#op " %0, %%" #reg \
-                               : /* nothing */ \
-                               : "m" (mem))
-
-#define        mmx_r2m(op, reg, mem) \
-       __asm__ __volatile__ (#op " %%" #reg ", %0" \
-                               : "=m" (mem) \
-                               : /* nothing */)
-
-#define        mmx_r2r(op, regs, regd) \
-       __asm__ __volatile__ (#op " %" #regs ", %" #regd)
-
-#define        emms() __asm__ __volatile__ ("emms")
-
-#define        movd_m2r(var, reg)      mmx_m2r(movd, var, reg)
-#define        movd_r2m(reg, var)      mmx_r2m(movd, reg, var)
-#define        movd_r2r(regs, regd)    mmx_r2r(movd, regs, regd)
-
-#define        movq_m2r(var, reg)      mmx_m2r(movq, var, reg)
-#define        movq_r2m(reg, var)      mmx_r2m(movq, reg, var)
-#define        movq_r2r(regs, regd)    mmx_r2r(movq, regs, regd)
-
-#define        packssdw_m2r(var, reg)          mmx_m2r(packssdw, var, reg)
-#define        packssdw_r2r(regs, regd)        mmx_r2r(packssdw, regs, regd)
-#define        packsswb_m2r(var, reg)          mmx_m2r(packsswb, var, reg)
-#define        packsswb_r2r(regs, regd)        mmx_r2r(packsswb, regs, regd)
-
-#define        packuswb_m2r(var, reg)          mmx_m2r(packuswb, var, reg)
-#define        packuswb_r2r(regs, regd)        mmx_r2r(packuswb, regs, regd)
-
-#define        paddb_m2r(var, reg)     mmx_m2r(paddb, var, reg)
-#define        paddb_r2r(regs, regd)   mmx_r2r(paddb, regs, regd)
-#define        paddd_m2r(var, reg)     mmx_m2r(paddd, var, reg)
-#define        paddd_r2r(regs, regd)   mmx_r2r(paddd, regs, regd)
-#define        paddw_m2r(var, reg)     mmx_m2r(paddw, var, reg)
-#define        paddw_r2r(regs, regd)   mmx_r2r(paddw, regs, regd)
-
-#define        paddsb_m2r(var, reg)    mmx_m2r(paddsb, var, reg)
-#define        paddsb_r2r(regs, regd)  mmx_r2r(paddsb, regs, regd)
-#define        paddsw_m2r(var, reg)    mmx_m2r(paddsw, var, reg)
-#define        paddsw_r2r(regs, regd)  mmx_r2r(paddsw, regs, regd)
-
-#define        paddusb_m2r(var, reg)   mmx_m2r(paddusb, var, reg)
-#define        paddusb_r2r(regs, regd) mmx_r2r(paddusb, regs, regd)
-#define        paddusw_m2r(var, reg)   mmx_m2r(paddusw, var, reg)
-#define        paddusw_r2r(regs, regd) mmx_r2r(paddusw, regs, regd)
-
-#define        pand_m2r(var, reg)      mmx_m2r(pand, var, reg)
-#define        pand_r2r(regs, regd)    mmx_r2r(pand, regs, regd)
-
-#define        pandn_m2r(var, reg)     mmx_m2r(pandn, var, reg)
-#define        pandn_r2r(regs, regd)   mmx_r2r(pandn, regs, regd)
-
-#define        pcmpeqb_m2r(var, reg)   mmx_m2r(pcmpeqb, var, reg)
-#define        pcmpeqb_r2r(regs, regd) mmx_r2r(pcmpeqb, regs, regd)
-#define        pcmpeqd_m2r(var, reg)   mmx_m2r(pcmpeqd, var, reg)
-#define        pcmpeqd_r2r(regs, regd) mmx_r2r(pcmpeqd, regs, regd)
-#define        pcmpeqw_m2r(var, reg)   mmx_m2r(pcmpeqw, var, reg)
-#define        pcmpeqw_r2r(regs, regd) mmx_r2r(pcmpeqw, regs, regd)
-
-#define        pcmpgtb_m2r(var, reg)   mmx_m2r(pcmpgtb, var, reg)
-#define        pcmpgtb_r2r(regs, regd) mmx_r2r(pcmpgtb, regs, regd)
-#define        pcmpgtd_m2r(var, reg)   mmx_m2r(pcmpgtd, var, reg)
-#define        pcmpgtd_r2r(regs, regd) mmx_r2r(pcmpgtd, regs, regd)
-#define        pcmpgtw_m2r(var, reg)   mmx_m2r(pcmpgtw, var, reg)
-#define        pcmpgtw_r2r(regs, regd) mmx_r2r(pcmpgtw, regs, regd)
-
-#define        pmaddwd_m2r(var, reg)   mmx_m2r(pmaddwd, var, reg)
-#define        pmaddwd_r2r(regs, regd) mmx_r2r(pmaddwd, regs, regd)
-
-#define        pmulhw_m2r(var, reg)    mmx_m2r(pmulhw, var, reg)
-#define        pmulhw_r2r(regs, regd)  mmx_r2r(pmulhw, regs, regd)
-
-#define        pmullw_m2r(var, reg)    mmx_m2r(pmullw, var, reg)
-#define        pmullw_r2r(regs, regd)  mmx_r2r(pmullw, regs, regd)
-
-#define        por_m2r(var, reg)       mmx_m2r(por, var, reg)
-#define        por_r2r(regs, regd)     mmx_r2r(por, regs, regd)
-
-#define        pslld_i2r(imm, reg)     mmx_i2r(pslld, imm, reg)
-#define        pslld_m2r(var, reg)     mmx_m2r(pslld, var, reg)
-#define        pslld_r2r(regs, regd)   mmx_r2r(pslld, regs, regd)
-#define        psllq_i2r(imm, reg)     mmx_i2r(psllq, imm, reg)
-#define        psllq_m2r(var, reg)     mmx_m2r(psllq, var, reg)
-#define        psllq_r2r(regs, regd)   mmx_r2r(psllq, regs, regd)
-#define        psllw_i2r(imm, reg)     mmx_i2r(psllw, imm, reg)
-#define        psllw_m2r(var, reg)     mmx_m2r(psllw, var, reg)
-#define        psllw_r2r(regs, regd)   mmx_r2r(psllw, regs, regd)
-
-#define        psrad_i2r(imm, reg)     mmx_i2r(psrad, imm, reg)
-#define        psrad_m2r(var, reg)     mmx_m2r(psrad, var, reg)
-#define        psrad_r2r(regs, regd)   mmx_r2r(psrad, regs, regd)
-#define        psraw_i2r(imm, reg)     mmx_i2r(psraw, imm, reg)
-#define        psraw_m2r(var, reg)     mmx_m2r(psraw, var, reg)
-#define        psraw_r2r(regs, regd)   mmx_r2r(psraw, regs, regd)
-
-#define        psrld_i2r(imm, reg)     mmx_i2r(psrld, imm, reg)
-#define        psrld_m2r(var, reg)     mmx_m2r(psrld, var, reg)
-#define        psrld_r2r(regs, regd)   mmx_r2r(psrld, regs, regd)
-#define        psrlq_i2r(imm, reg)     mmx_i2r(psrlq, imm, reg)
-#define        psrlq_m2r(var, reg)     mmx_m2r(psrlq, var, reg)
-#define        psrlq_r2r(regs, regd)   mmx_r2r(psrlq, regs, regd)
-#define        psrlw_i2r(imm, reg)     mmx_i2r(psrlw, imm, reg)
-#define        psrlw_m2r(var, reg)     mmx_m2r(psrlw, var, reg)
-#define        psrlw_r2r(regs, regd)   mmx_r2r(psrlw, regs, regd)
-
-#define        psubb_m2r(var, reg)     mmx_m2r(psubb, var, reg)
-#define        psubb_r2r(regs, regd)   mmx_r2r(psubb, regs, regd)
-#define        psubd_m2r(var, reg)     mmx_m2r(psubd, var, reg)
-#define        psubd_r2r(regs, regd)   mmx_r2r(psubd, regs, regd)
-#define        psubw_m2r(var, reg)     mmx_m2r(psubw, var, reg)
-#define        psubw_r2r(regs, regd)   mmx_r2r(psubw, regs, regd)
-
-#define        psubsb_m2r(var, reg)    mmx_m2r(psubsb, var, reg)
-#define        psubsb_r2r(regs, regd)  mmx_r2r(psubsb, regs, regd)
-#define        psubsw_m2r(var, reg)    mmx_m2r(psubsw, var, reg)
-#define        psubsw_r2r(regs, regd)  mmx_r2r(psubsw, regs, regd)
-
-#define        psubusb_m2r(var, reg)   mmx_m2r(psubusb, var, reg)
-#define        psubusb_r2r(regs, regd) mmx_r2r(psubusb, regs, regd)
-#define        psubusw_m2r(var, reg)   mmx_m2r(psubusw, var, reg)
-#define        psubusw_r2r(regs, regd) mmx_r2r(psubusw, regs, regd)
-
-#define        punpckhbw_m2r(var, reg)         mmx_m2r(punpckhbw, var, reg)
-#define        punpckhbw_r2r(regs, regd)       mmx_r2r(punpckhbw, regs, regd)
-#define        punpckhdq_m2r(var, reg)         mmx_m2r(punpckhdq, var, reg)
-#define        punpckhdq_r2r(regs, regd)       mmx_r2r(punpckhdq, regs, regd)
-#define        punpckhwd_m2r(var, reg)         mmx_m2r(punpckhwd, var, reg)
-#define        punpckhwd_r2r(regs, regd)       mmx_r2r(punpckhwd, regs, regd)
-
-#define        punpcklbw_m2r(var, reg)         mmx_m2r(punpcklbw, var, reg)
-#define        punpcklbw_r2r(regs, regd)       mmx_r2r(punpcklbw, regs, regd)
-#define        punpckldq_m2r(var, reg)         mmx_m2r(punpckldq, var, reg)
-#define        punpckldq_r2r(regs, regd)       mmx_r2r(punpckldq, regs, regd)
-#define        punpcklwd_m2r(var, reg)         mmx_m2r(punpcklwd, var, reg)
-#define        punpcklwd_r2r(regs, regd)       mmx_r2r(punpcklwd, regs, regd)
-
-#define        pxor_m2r(var, reg)      mmx_m2r(pxor, var, reg)
-#define        pxor_r2r(regs, regd)    mmx_r2r(pxor, regs, regd)
-
-/* 3DNOW extensions */
-
-#define        pavgusb_m2r(var, reg)   mmx_m2r(pavgusb, var, reg)
-#define        pavgusb_r2r(regs, regd) mmx_r2r(pavgusb, regs, regd)
-
-/* AMD MMX extensions - also available in intel SSE */
-
-#define        mmx_m2ri(op, mem, reg, imm) \
-       __asm__ __volatile__ (#op " %1, %0, %%" #reg \
-                               : /* nothing */ \
-                               : "m" (mem), "i" (imm))
-#define        mmx_r2ri(op, regs, regd, imm) \
-       __asm__ __volatile__ (#op " %0, %%" #regs ", %%" #regd \
-                               : /* nothing */ \
-                               : "i" (imm))
-
-#define        mmx_fetch(mem, hint) \
-       __asm__ __volatile__ ("prefetch" #hint " %0" \
-                               : /* nothing */ \
-                               : "m" (mem))
-
-#define        maskmovq(regs, maskreg) mmx_r2ri(maskmovq, regs, maskreg)
-
-#define        movntq_r2m(mmreg, var)  mmx_r2m(movntq, mmreg, var)
-
-#define        pavgb_m2r(var, reg)     mmx_m2r(pavgb, var, reg)
-#define        pavgb_r2r(regs, regd)   mmx_r2r(pavgb, regs, regd)
-#define        pavgw_m2r(var, reg)     mmx_m2r(pavgw, var, reg)
-#define        pavgw_r2r(regs, regd)   mmx_r2r(pavgw, regs, regd)
-
-#define        pextrw_r2r(mmreg, reg, imm)     mmx_r2ri(pextrw, mmreg, reg, imm)
-
-#define        pinsrw_r2r(reg, mmreg, imm)     mmx_r2ri(pinsrw, reg, mmreg, imm)
-
-#define        pmaxsw_m2r(var, reg)    mmx_m2r(pmaxsw, var, reg)
-#define        pmaxsw_r2r(regs, regd)  mmx_r2r(pmaxsw, regs, regd)
-
-#define        pmaxub_m2r(var, reg)    mmx_m2r(pmaxub, var, reg)
-#define        pmaxub_r2r(regs, regd)  mmx_r2r(pmaxub, regs, regd)
-
-#define        pminsw_m2r(var, reg)    mmx_m2r(pminsw, var, reg)
-#define        pminsw_r2r(regs, regd)  mmx_r2r(pminsw, regs, regd)
-
-#define        pminub_m2r(var, reg)    mmx_m2r(pminub, var, reg)
-#define        pminub_r2r(regs, regd)  mmx_r2r(pminub, regs, regd)
-
-#define        pmovmskb(mmreg, reg) \
-       __asm__ __volatile__ ("movmskps %" #mmreg ", %" #reg)
-
-#define        pmulhuw_m2r(var, reg)   mmx_m2r(pmulhuw, var, reg)
-#define        pmulhuw_r2r(regs, regd) mmx_r2r(pmulhuw, regs, regd)
-
-#define        prefetcht0(mem)         mmx_fetch(mem, t0)
-#define        prefetcht1(mem)         mmx_fetch(mem, t1)
-#define        prefetcht2(mem)         mmx_fetch(mem, t2)
-#define        prefetchnta(mem)        mmx_fetch(mem, nta)
-
-#define        psadbw_m2r(var, reg)    mmx_m2r(psadbw, var, reg)
-#define        psadbw_r2r(regs, regd)  mmx_r2r(psadbw, regs, regd)
-
-#define        pshufw_m2r(var, reg, imm)       mmx_m2ri(pshufw, var, reg, imm)
-#define        pshufw_r2r(regs, regd, imm)     mmx_r2ri(pshufw, regs, regd, imm)
-
-#define        sfence() __asm__ __volatile__ ("sfence\n\t")
-
-/* SSE2 */
-#define        pshufhw_m2r(var, reg, imm)      mmx_m2ri(pshufhw, var, reg, imm)
-#define        pshufhw_r2r(regs, regd, imm)    mmx_r2ri(pshufhw, regs, regd, imm)
-#define        pshuflw_m2r(var, reg, imm)      mmx_m2ri(pshuflw, var, reg, imm)
-#define        pshuflw_r2r(regs, regd, imm)    mmx_r2ri(pshuflw, regs, regd, imm)
-
-#define        pshufd_r2r(regs, regd, imm)     mmx_r2ri(pshufd, regs, regd, imm)
-
-#define        movdqa_m2r(var, reg)    mmx_m2r(movdqa, var, reg)
-#define        movdqa_r2m(reg, var)    mmx_r2m(movdqa, reg, var)
-#define        movdqa_r2r(regs, regd)  mmx_r2r(movdqa, regs, regd)
-#define        movdqu_m2r(var, reg)    mmx_m2r(movdqu, var, reg)
-#define        movdqu_r2m(reg, var)    mmx_r2m(movdqu, reg, var)
-#define        movdqu_r2r(regs, regd)  mmx_r2r(movdqu, regs, regd)
-
-#define        pmullw_r2m(reg, var)    mmx_r2m(pmullw, reg, var)
-
-#define        pslldq_i2r(imm, reg)    mmx_i2r(pslldq, imm, reg)
-#define        psrldq_i2r(imm, reg)    mmx_i2r(psrldq, imm, reg)
-
-#define        punpcklqdq_r2r(regs, regd)      mmx_r2r(punpcklqdq, regs, regd)
-#define        punpckhqdq_r2r(regs, regd)      mmx_r2r(punpckhqdq, regs, regd)
-
-#endif /* AVCODEC_I386MMX_H */