mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
ALSA: intel8x0 - Add missing KERN_* prefix to printk
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
b833b5ec04
commit
14ab086109
2 changed files with 17 additions and 8 deletions
|
@ -689,7 +689,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich
|
||||||
bdbar[idx + 1] = cpu_to_le32(0x80000000 | /* interrupt on completion */
|
bdbar[idx + 1] = cpu_to_le32(0x80000000 | /* interrupt on completion */
|
||||||
ichdev->fragsize >> ichdev->pos_shift);
|
ichdev->fragsize >> ichdev->pos_shift);
|
||||||
#if 0
|
#if 0
|
||||||
printk("bdbar[%i] = 0x%x [0x%x]\n",
|
printk(KERN_DEBUG "bdbar[%i] = 0x%x [0x%x]\n",
|
||||||
idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
|
idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -701,8 +701,10 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich
|
||||||
ichdev->lvi_frag = ICH_REG_LVI_MASK % ichdev->frags;
|
ichdev->lvi_frag = ICH_REG_LVI_MASK % ichdev->frags;
|
||||||
ichdev->position = 0;
|
ichdev->position = 0;
|
||||||
#if 0
|
#if 0
|
||||||
printk("lvi_frag = %i, frags = %i, period_size = 0x%x, period_size1 = 0x%x\n",
|
printk(KERN_DEBUG "lvi_frag = %i, frags = %i, period_size = 0x%x, "
|
||||||
ichdev->lvi_frag, ichdev->frags, ichdev->fragsize, ichdev->fragsize1);
|
"period_size1 = 0x%x\n",
|
||||||
|
ichdev->lvi_frag, ichdev->frags, ichdev->fragsize,
|
||||||
|
ichdev->fragsize1);
|
||||||
#endif
|
#endif
|
||||||
/* clear interrupts */
|
/* clear interrupts */
|
||||||
iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
|
iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
|
||||||
|
@ -768,7 +770,8 @@ static inline void snd_intel8x0_update(struct intel8x0 *chip, struct ichdev *ich
|
||||||
ichdev->lvi_frag %= ichdev->frags;
|
ichdev->lvi_frag %= ichdev->frags;
|
||||||
ichdev->bdbar[ichdev->lvi * 2] = cpu_to_le32(ichdev->physbuf + ichdev->lvi_frag * ichdev->fragsize1);
|
ichdev->bdbar[ichdev->lvi * 2] = cpu_to_le32(ichdev->physbuf + ichdev->lvi_frag * ichdev->fragsize1);
|
||||||
#if 0
|
#if 0
|
||||||
printk("new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n",
|
printk(KERN_DEBUG "new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, "
|
||||||
|
"all = 0x%x, 0x%x\n",
|
||||||
ichdev->lvi * 2, ichdev->bdbar[ichdev->lvi * 2],
|
ichdev->lvi * 2, ichdev->bdbar[ichdev->lvi * 2],
|
||||||
ichdev->bdbar[ichdev->lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),
|
ichdev->bdbar[ichdev->lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),
|
||||||
inl(port + 4), inb(port + ICH_REG_OFF_CR));
|
inl(port + 4), inb(port + ICH_REG_OFF_CR));
|
||||||
|
|
|
@ -411,7 +411,10 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic
|
||||||
bdbar[idx + 0] = cpu_to_le32(ichdev->physbuf + (((idx >> 1) * ichdev->fragsize) % ichdev->size));
|
bdbar[idx + 0] = cpu_to_le32(ichdev->physbuf + (((idx >> 1) * ichdev->fragsize) % ichdev->size));
|
||||||
bdbar[idx + 1] = cpu_to_le32(0x80000000 | /* interrupt on completion */
|
bdbar[idx + 1] = cpu_to_le32(0x80000000 | /* interrupt on completion */
|
||||||
ichdev->fragsize >> chip->pcm_pos_shift);
|
ichdev->fragsize >> chip->pcm_pos_shift);
|
||||||
// printk("bdbar[%i] = 0x%x [0x%x]\n", idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
|
/*
|
||||||
|
printk(KERN_DEBUG "bdbar[%i] = 0x%x [0x%x]\n",
|
||||||
|
idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
ichdev->frags = ichdev->size / ichdev->fragsize;
|
ichdev->frags = ichdev->size / ichdev->fragsize;
|
||||||
}
|
}
|
||||||
|
@ -421,8 +424,10 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic
|
||||||
ichdev->lvi_frag = ICH_REG_LVI_MASK % ichdev->frags;
|
ichdev->lvi_frag = ICH_REG_LVI_MASK % ichdev->frags;
|
||||||
ichdev->position = 0;
|
ichdev->position = 0;
|
||||||
#if 0
|
#if 0
|
||||||
printk("lvi_frag = %i, frags = %i, period_size = 0x%x, period_size1 = 0x%x\n",
|
printk(KERN_DEBUG "lvi_frag = %i, frags = %i, period_size = 0x%x, "
|
||||||
ichdev->lvi_frag, ichdev->frags, ichdev->fragsize, ichdev->fragsize1);
|
"period_size1 = 0x%x\n",
|
||||||
|
ichdev->lvi_frag, ichdev->frags, ichdev->fragsize,
|
||||||
|
ichdev->fragsize1);
|
||||||
#endif
|
#endif
|
||||||
/* clear interrupts */
|
/* clear interrupts */
|
||||||
iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
|
iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
|
||||||
|
@ -465,7 +470,8 @@ static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ic
|
||||||
ichdev->lvi_frag *
|
ichdev->lvi_frag *
|
||||||
ichdev->fragsize1);
|
ichdev->fragsize1);
|
||||||
#if 0
|
#if 0
|
||||||
printk("new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n",
|
printk(KERN_DEBUG "new: bdbar[%i] = 0x%x [0x%x], "
|
||||||
|
"prefetch = %i, all = 0x%x, 0x%x\n",
|
||||||
ichdev->lvi * 2, ichdev->bdbar[ichdev->lvi * 2],
|
ichdev->lvi * 2, ichdev->bdbar[ichdev->lvi * 2],
|
||||||
ichdev->bdbar[ichdev->lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),
|
ichdev->bdbar[ichdev->lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),
|
||||||
inl(port + 4), inb(port + ICH_REG_OFF_CR));
|
inl(port + 4), inb(port + ICH_REG_OFF_CR));
|
||||||
|
|
Loading…
Reference in a new issue