diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
| commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
| tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /sound/pcmcia | |
| parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
| parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pcmcia')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 23 | ||||
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 4 |
2 files changed, 17 insertions, 10 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c index dfa40b0ed86d..5d2afa0b0ce4 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c | |||
| @@ -82,14 +82,21 @@ static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned c | |||
| 82 | #if 0 | 82 | #if 0 |
| 83 | void pdacf_dump(struct snd_pdacf *chip) | 83 | void pdacf_dump(struct snd_pdacf *chip) |
| 84 | { | 84 | { |
| 85 | printk("PDAUDIOCF DUMP (0x%lx):\n", chip->port); | 85 | printk(KERN_DEBUG "PDAUDIOCF DUMP (0x%lx):\n", chip->port); |
| 86 | printk("WPD : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_WDP)); | 86 | printk(KERN_DEBUG "WPD : 0x%x\n", |
| 87 | printk("RDP : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_RDP)); | 87 | inw(chip->port + PDAUDIOCF_REG_WDP)); |
| 88 | printk("TCR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_TCR)); | 88 | printk(KERN_DEBUG "RDP : 0x%x\n", |
| 89 | printk("SCR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_SCR)); | 89 | inw(chip->port + PDAUDIOCF_REG_RDP)); |
| 90 | printk("ISR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_ISR)); | 90 | printk(KERN_DEBUG "TCR : 0x%x\n", |
| 91 | printk("IER : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_IER)); | 91 | inw(chip->port + PDAUDIOCF_REG_TCR)); |
| 92 | printk("AK_IFR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_AK_IFR)); | 92 | printk(KERN_DEBUG "SCR : 0x%x\n", |
| 93 | inw(chip->port + PDAUDIOCF_REG_SCR)); | ||
| 94 | printk(KERN_DEBUG "ISR : 0x%x\n", | ||
| 95 | inw(chip->port + PDAUDIOCF_REG_ISR)); | ||
| 96 | printk(KERN_DEBUG "IER : 0x%x\n", | ||
| 97 | inw(chip->port + PDAUDIOCF_REG_IER)); | ||
| 98 | printk(KERN_DEBUG "AK_IFR : 0x%x\n", | ||
| 99 | inw(chip->port + PDAUDIOCF_REG_AK_IFR)); | ||
| 93 | } | 100 | } |
| 94 | #endif | 101 | #endif |
| 95 | 102 | ||
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c index ea903c8e90dd..dcd32201bc8c 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | |||
| @@ -269,7 +269,7 @@ void pdacf_tasklet(unsigned long private_data) | |||
| 269 | 269 | ||
| 270 | rdp = inw(chip->port + PDAUDIOCF_REG_RDP); | 270 | rdp = inw(chip->port + PDAUDIOCF_REG_RDP); |
| 271 | wdp = inw(chip->port + PDAUDIOCF_REG_WDP); | 271 | wdp = inw(chip->port + PDAUDIOCF_REG_WDP); |
| 272 | // printk("TASKLET: rdp = %x, wdp = %x\n", rdp, wdp); | 272 | /* printk(KERN_DEBUG "TASKLET: rdp = %x, wdp = %x\n", rdp, wdp); */ |
| 273 | size = wdp - rdp; | 273 | size = wdp - rdp; |
| 274 | if (size < 0) | 274 | if (size < 0) |
| 275 | size += 0x10000; | 275 | size += 0x10000; |
| @@ -321,5 +321,5 @@ void pdacf_tasklet(unsigned long private_data) | |||
| 321 | spin_lock(&chip->reg_lock); | 321 | spin_lock(&chip->reg_lock); |
| 322 | } | 322 | } |
| 323 | spin_unlock(&chip->reg_lock); | 323 | spin_unlock(&chip->reg_lock); |
| 324 | // printk("TASKLET: end\n"); | 324 | /* printk(KERN_DEBUG "TASKLET: end\n"); */ |
| 325 | } | 325 | } |