OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: powermac - Add missing KERN_* prefix to printk 

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2009-02-05 16:02:46 +01:00
parent dca7c74172
commit 6da6711385
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/ppc/daca.c
View File

@ -82,7 +82,7 @@ static int daca_set_volume(struct pmac_daca *mix)
data[1] |= mix->deemphasis ? 0x40 : 0; data[1] |= mix->deemphasis ? 0x40 : 0;
if (i2c_smbus_write_block_data(mix->i2c.client, DACA_REG_AVOL, if (i2c_smbus_write_block_data(mix->i2c.client, DACA_REG_AVOL,
2, data) < 0) { 2, data) < 0) {
snd_printk("failed to set volume \n"); snd_printk(KERN_ERR "failed to set volume \n");
return -EINVAL; return -EINVAL;
} }
return 0; return 0;

8
sound/ppc/pmac.c
View File

@ -299,7 +299,7 @@ static int snd_pmac_pcm_trigger(struct snd_pmac *chip, struct pmac_stream *rec,
case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_SUSPEND:
spin_lock(&chip->reg_lock); spin_lock(&chip->reg_lock);
rec->running = 0; rec->running = 0;
/*printk("stopped!!\n");*/ /*printk(KERN_DEBUG "stopped!!\n");*/
snd_pmac_dma_stop(rec); snd_pmac_dma_stop(rec);
for (i = 0, cp = rec->cmd.cmds; i < rec->nperiods; i++, cp++) for (i = 0, cp = rec->cmd.cmds; i < rec->nperiods; i++, cp++)
out_le16(&cp->command, DBDMA_STOP); out_le16(&cp->command, DBDMA_STOP);
@ -334,7 +334,7 @@ static snd_pcm_uframes_t snd_pmac_pcm_pointer(struct snd_pmac *chip,
} }
#endif #endif
count += rec->cur_period * rec->period_size; count += rec->cur_period * rec->period_size;
/*printk("pointer=%d\n", count);*/ /*printk(KERN_DEBUG "pointer=%d\n", count);*/
return bytes_to_frames(subs->runtime, count); return bytes_to_frames(subs->runtime, count);
} }
@ -486,7 +486,7 @@ static void snd_pmac_pcm_update(struct snd_pmac *chip, struct pmac_stream *rec)
if (! (stat & ACTIVE)) if (! (stat & ACTIVE))
break; break;
/*printk("update frag %d\n", rec->cur_period);*/ /*printk(KERN_DEBUG "update frag %d\n", rec->cur_period);*/
st_le16(&cp->xfer_status, 0); st_le16(&cp->xfer_status, 0);
st_le16(&cp->req_count, rec->period_size); st_le16(&cp->req_count, rec->period_size);
/*st_le16(&cp->res_count, 0);*/ /*st_le16(&cp->res_count, 0);*/
@ -806,7 +806,7 @@ snd_pmac_ctrl_intr(int irq, void *devid)
struct snd_pmac *chip = devid; struct snd_pmac *chip = devid;
int ctrl = in_le32(&chip->awacs->control); int ctrl = in_le32(&chip->awacs->control);
/*printk("pmac: control interrupt.. 0x%x\n", ctrl);*/ /*printk(KERN_DEBUG "pmac: control interrupt.. 0x%x\n", ctrl);*/
if (ctrl & MASK_PORTCHG) { if (ctrl & MASK_PORTCHG) {
/* do something when headphone is plugged/unplugged? */ /* do something when headphone is plugged/unplugged? */
if (chip->update_automute) if (chip->update_automute)

2
sound/ppc/powermac.c
View File

@ -110,7 +110,7 @@ static int __init snd_pmac_probe(struct platform_device *devptr)
goto __error; goto __error;
break; break;
default: default:
snd_printk("unsupported hardware %d\n", chip->model); snd_printk(KERN_ERR "unsupported hardware %d\n", chip->model);
err = -EINVAL; err = -EINVAL;
goto __error; goto __error;
} }

13
sound/ppc/tumbler.c
View File

@ -41,7 +41,7 @@
#undef DEBUG #undef DEBUG
#ifdef DEBUG #ifdef DEBUG
#define DBG(fmt...) printk(fmt) #define DBG(fmt...) printk(KERN_DEBUG fmt)
#else #else
#define DBG(fmt...) #define DBG(fmt...)
#endif #endif
@ -240,7 +240,7 @@ static int tumbler_set_master_volume(struct pmac_tumbler *mix)
if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_VOL, 6, if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_VOL, 6,
block) < 0) { block) < 0) {
snd_printk("failed to set volume \n"); snd_printk(KERN_ERR "failed to set volume \n");
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -350,7 +350,7 @@ static int tumbler_set_drc(struct pmac_tumbler *mix)
if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC,
2, val) < 0) { 2, val) < 0) {
snd_printk("failed to set DRC\n"); snd_printk(KERN_ERR "failed to set DRC\n");
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -386,7 +386,7 @@ static int snapper_set_drc(struct pmac_tumbler *mix)
if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC,
6, val) < 0) { 6, val) < 0) {
snd_printk("failed to set DRC\n"); snd_printk(KERN_ERR "failed to set DRC\n");
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -506,7 +506,8 @@ static int tumbler_set_mono_volume(struct pmac_tumbler *mix,
block[i] = (vol >> ((info->bytes - i - 1) * 8)) & 0xff; block[i] = (vol >> ((info->bytes - i - 1) * 8)) & 0xff;
if (i2c_smbus_write_i2c_block_data(mix->i2c.client, info->reg, if (i2c_smbus_write_i2c_block_data(mix->i2c.client, info->reg,
info->bytes, block) < 0) { info->bytes, block) < 0) {
snd_printk("failed to set mono volume %d\n", info->index); snd_printk(KERN_ERR "failed to set mono volume %d\n",
info->index);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -643,7 +644,7 @@ static int snapper_set_mix_vol1(struct pmac_tumbler *mix, int idx, int ch, int r
} }
if (i2c_smbus_write_i2c_block_data(mix->i2c.client, reg, if (i2c_smbus_write_i2c_block_data(mix->i2c.client, reg,
9, block) < 0) { 9, block) < 0) {
snd_printk("failed to set mono volume %d\n", reg); snd_printk(KERN_ERR "failed to set mono volume %d\n", reg);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;