aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/cs5535audio/cs5535audio.c
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@debian.org>2007-09-03 09:43:43 -0400
committerJaroslav Kysela <perex@perex.cz>2007-10-16 09:59:54 -0400
commit4ea24163986e65f8ea6208525a135df2ebfe070a (patch)
treeefaba0b32d50973db98f469c03256879c5de56f9 /sound/pci/cs5535audio/cs5535audio.c
parent506ea68cd9e8899ac2b97f466956e670d60026dc (diff)
[ALSA] cs5535audio: drop unused bus master stuff
We really only care about the first two bus masters (playback and capture). There's no need to have unused BM code lying around, so let's get rid of it. If for some reason we trigger an IRQ for some BM that we're not using.. well, that warrants spitting out an error message (imo). Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/cs5535audio/cs5535audio.c')
-rw-r--r--sound/pci/cs5535audio/cs5535audio.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index b8e75ef9c1e6..2b35889787be 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -206,7 +206,6 @@ static void process_bm1_irq(struct cs5535audio *cs5535au)
206static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id) 206static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)
207{ 207{
208 u16 acc_irq_stat; 208 u16 acc_irq_stat;
209 u8 bm_stat;
210 unsigned char count; 209 unsigned char count;
211 struct cs5535audio *cs5535au = dev_id; 210 struct cs5535audio *cs5535au = dev_id;
212 211
@@ -217,7 +216,7 @@ static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)
217 216
218 if (!acc_irq_stat) 217 if (!acc_irq_stat)
219 return IRQ_NONE; 218 return IRQ_NONE;
220 for (count = 0; count < 10; count++) { 219 for (count = 0; count < 4; count++) {
221 if (acc_irq_stat & (1 << count)) { 220 if (acc_irq_stat & (1 << count)) {
222 switch (count) { 221 switch (count) {
223 case IRQ_STS: 222 case IRQ_STS:
@@ -232,26 +231,9 @@ static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)
232 case BM1_IRQ_STS: 231 case BM1_IRQ_STS:
233 process_bm1_irq(cs5535au); 232 process_bm1_irq(cs5535au);
234 break; 233 break;
235 case BM2_IRQ_STS:
236 bm_stat = cs_readb(cs5535au, ACC_BM2_STATUS);
237 break;
238 case BM3_IRQ_STS:
239 bm_stat = cs_readb(cs5535au, ACC_BM3_STATUS);
240 break;
241 case BM4_IRQ_STS:
242 bm_stat = cs_readb(cs5535au, ACC_BM4_STATUS);
243 break;
244 case BM5_IRQ_STS:
245 bm_stat = cs_readb(cs5535au, ACC_BM5_STATUS);
246 break;
247 case BM6_IRQ_STS:
248 bm_stat = cs_readb(cs5535au, ACC_BM6_STATUS);
249 break;
250 case BM7_IRQ_STS:
251 bm_stat = cs_readb(cs5535au, ACC_BM7_STATUS);
252 break;
253 default: 234 default:
254 snd_printk(KERN_ERR "Unexpected irq src\n"); 235 snd_printk(KERN_ERR "Unexpected irq src: "
236 "0x%x\n", acc_irq_stat);
255 break; 237 break;
256 } 238 }
257 } 239 }