1 files changed, 6 insertions, 36 deletions

diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h
index 4fd1f31a6cf9..66bae7664193 100644
--- a/sound/pci/cs5535audio/cs5535audio.h
+++ b/sound/pci/cs5535audio/cs5535audio.h
@@ -16,57 +16,28 @@
 #define ACC_IRQ_STATUS                  0x12
 #define ACC_BM0_CMD                     0x20
 #define ACC_BM1_CMD                     0x28
-#define ACC_BM2_CMD                     0x30
-#define ACC_BM3_CMD                     0x38
-#define ACC_BM4_CMD                     0x40
-#define ACC_BM5_CMD                     0x48
-#define ACC_BM6_CMD                     0x50
-#define ACC_BM7_CMD                     0x58
 #define ACC_BM0_PRD                     0x24
 #define ACC_BM1_PRD                     0x2C
-#define ACC_BM2_PRD                     0x34
-#define ACC_BM3_PRD                     0x3C
-#define ACC_BM4_PRD                     0x44
-#define ACC_BM5_PRD                     0x4C
-#define ACC_BM6_PRD                     0x54
-#define ACC_BM7_PRD                     0x5C
 #define ACC_BM0_STATUS                  0x21
 #define ACC_BM1_STATUS                  0x29
-#define ACC_BM2_STATUS                  0x31
-#define ACC_BM3_STATUS                  0x39
-#define ACC_BM4_STATUS                  0x41
-#define ACC_BM5_STATUS                  0x49
-#define ACC_BM6_STATUS                  0x51
-#define ACC_BM7_STATUS                  0x59
 #define ACC_BM0_PNTR                    0x60
 #define ACC_BM1_PNTR                    0x64
-#define ACC_BM2_PNTR                    0x68
-#define ACC_BM3_PNTR                    0x6C
-#define ACC_BM4_PNTR                    0x70
-#define ACC_BM5_PNTR                    0x74
-#define ACC_BM6_PNTR                    0x78
-#define ACC_BM7_PNTR                    0x7C
+
 /* acc_codec bar0 reg bits */
 /* ACC_IRQ_STATUS */
 #define IRQ_STS                         0
 #define WU_IRQ_STS                      1
 #define BM0_IRQ_STS                     2
 #define BM1_IRQ_STS                     3
-#define BM2_IRQ_STS                     4
-#define BM3_IRQ_STS                     5
-#define BM4_IRQ_STS                     6
-#define BM5_IRQ_STS                     7
-#define BM6_IRQ_STS                     8
-#define BM7_IRQ_STS                     9
 /* ACC_BMX_STATUS */
 #define EOP                             (1<<0)
 #define BM_EOP_ERR                      (1<<1)
 /* ACC_BMX_CTL */
-#define BM_CTL_EN                       0x00000001
-#define BM_CTL_PAUSE                    0x00000011
-#define BM_CTL_DIS                      0x00000000
-#define BM_CTL_BYTE_ORD_LE              0x00000000
-#define BM_CTL_BYTE_ORD_BE              0x00000100
+#define BM_CTL_EN                       0x01
+#define BM_CTL_PAUSE                    0x03
+#define BM_CTL_DIS                      0x00
+#define BM_CTL_BYTE_ORD_LE              0x00
+#define BM_CTL_BYTE_ORD_BE              0x04
 /* cs5535 specific ac97 codec register defines */
 #define CMD_MASK                        0xFF00FFFF
 #define CMD_NEW                         0x00010000
@@ -106,7 +77,6 @@ struct cs5535audio_dma {
         struct snd_pcm_substream *substream;
         unsigned int buf_addr, buf_bytes;
         unsigned int period_bytes, periods;
-        int suspended;
         u32 saved_prd;
 };