diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/ppc/daca.c | 2 | ||||
-rw-r--r-- | sound/ppc/pmac.c | 8 | ||||
-rw-r--r-- | sound/ppc/powermac.c | 2 | ||||
-rw-r--r-- | sound/ppc/tumbler.c | 13 |
4 files changed, 13 insertions, 12 deletions
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index 8a5b29031933..f8d478c2da62 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c | |||
@@ -82,7 +82,7 @@ static int daca_set_volume(struct pmac_daca *mix) | |||
82 | data[1] |= mix->deemphasis ? 0x40 : 0; | 82 | data[1] |= mix->deemphasis ? 0x40 : 0; |
83 | if (i2c_smbus_write_block_data(mix->i2c.client, DACA_REG_AVOL, | 83 | if (i2c_smbus_write_block_data(mix->i2c.client, DACA_REG_AVOL, |
84 | 2, data) < 0) { | 84 | 2, data) < 0) { |
85 | snd_printk("failed to set volume \n"); | 85 | snd_printk(KERN_ERR "failed to set volume \n"); |
86 | return -EINVAL; | 86 | return -EINVAL; |
87 | } | 87 | } |
88 | return 0; | 88 | return 0; |
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index bd8f92b1c224..9b4e9c316695 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
@@ -299,7 +299,7 @@ static int snd_pmac_pcm_trigger(struct snd_pmac *chip, struct pmac_stream *rec, | |||
299 | case SNDRV_PCM_TRIGGER_SUSPEND: | 299 | case SNDRV_PCM_TRIGGER_SUSPEND: |
300 | spin_lock(&chip->reg_lock); | 300 | spin_lock(&chip->reg_lock); |
301 | rec->running = 0; | 301 | rec->running = 0; |
302 | /*printk("stopped!!\n");*/ | 302 | /*printk(KERN_DEBUG "stopped!!\n");*/ |
303 | snd_pmac_dma_stop(rec); | 303 | snd_pmac_dma_stop(rec); |
304 | for (i = 0, cp = rec->cmd.cmds; i < rec->nperiods; i++, cp++) | 304 | for (i = 0, cp = rec->cmd.cmds; i < rec->nperiods; i++, cp++) |
305 | out_le16(&cp->command, DBDMA_STOP); | 305 | out_le16(&cp->command, DBDMA_STOP); |
@@ -334,7 +334,7 @@ static snd_pcm_uframes_t snd_pmac_pcm_pointer(struct snd_pmac *chip, | |||
334 | } | 334 | } |
335 | #endif | 335 | #endif |
336 | count += rec->cur_period * rec->period_size; | 336 | count += rec->cur_period * rec->period_size; |
337 | /*printk("pointer=%d\n", count);*/ | 337 | /*printk(KERN_DEBUG "pointer=%d\n", count);*/ |
338 | return bytes_to_frames(subs->runtime, count); | 338 | return bytes_to_frames(subs->runtime, count); |
339 | } | 339 | } |
340 | 340 | ||
@@ -486,7 +486,7 @@ static void snd_pmac_pcm_update(struct snd_pmac *chip, struct pmac_stream *rec) | |||
486 | if (! (stat & ACTIVE)) | 486 | if (! (stat & ACTIVE)) |
487 | break; | 487 | break; |
488 | 488 | ||
489 | /*printk("update frag %d\n", rec->cur_period);*/ | 489 | /*printk(KERN_DEBUG "update frag %d\n", rec->cur_period);*/ |
490 | st_le16(&cp->xfer_status, 0); | 490 | st_le16(&cp->xfer_status, 0); |
491 | st_le16(&cp->req_count, rec->period_size); | 491 | st_le16(&cp->req_count, rec->period_size); |
492 | /*st_le16(&cp->res_count, 0);*/ | 492 | /*st_le16(&cp->res_count, 0);*/ |
@@ -806,7 +806,7 @@ snd_pmac_ctrl_intr(int irq, void *devid) | |||
806 | struct snd_pmac *chip = devid; | 806 | struct snd_pmac *chip = devid; |
807 | int ctrl = in_le32(&chip->awacs->control); | 807 | int ctrl = in_le32(&chip->awacs->control); |
808 | 808 | ||
809 | /*printk("pmac: control interrupt.. 0x%x\n", ctrl);*/ | 809 | /*printk(KERN_DEBUG "pmac: control interrupt.. 0x%x\n", ctrl);*/ |
810 | if (ctrl & MASK_PORTCHG) { | 810 | if (ctrl & MASK_PORTCHG) { |
811 | /* do something when headphone is plugged/unplugged? */ | 811 | /* do something when headphone is plugged/unplugged? */ |
812 | if (chip->update_automute) | 812 | if (chip->update_automute) |
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index c936225771ba..e9b02d974350 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c | |||
@@ -110,7 +110,7 @@ static int __init snd_pmac_probe(struct platform_device *devptr) | |||
110 | goto __error; | 110 | goto __error; |
111 | break; | 111 | break; |
112 | default: | 112 | default: |
113 | snd_printk("unsupported hardware %d\n", chip->model); | 113 | snd_printk(KERN_ERR "unsupported hardware %d\n", chip->model); |
114 | err = -EINVAL; | 114 | err = -EINVAL; |
115 | goto __error; | 115 | goto __error; |
116 | } | 116 | } |
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 3eb223385416..40222fcc0878 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #undef DEBUG | 41 | #undef DEBUG |
42 | 42 | ||
43 | #ifdef DEBUG | 43 | #ifdef DEBUG |
44 | #define DBG(fmt...) printk(fmt) | 44 | #define DBG(fmt...) printk(KERN_DEBUG fmt) |
45 | #else | 45 | #else |
46 | #define DBG(fmt...) | 46 | #define DBG(fmt...) |
47 | #endif | 47 | #endif |
@@ -240,7 +240,7 @@ static int tumbler_set_master_volume(struct pmac_tumbler *mix) | |||
240 | 240 | ||
241 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_VOL, 6, | 241 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_VOL, 6, |
242 | block) < 0) { | 242 | block) < 0) { |
243 | snd_printk("failed to set volume \n"); | 243 | snd_printk(KERN_ERR "failed to set volume \n"); |
244 | return -EINVAL; | 244 | return -EINVAL; |
245 | } | 245 | } |
246 | return 0; | 246 | return 0; |
@@ -350,7 +350,7 @@ static int tumbler_set_drc(struct pmac_tumbler *mix) | |||
350 | 350 | ||
351 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, | 351 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, |
352 | 2, val) < 0) { | 352 | 2, val) < 0) { |
353 | snd_printk("failed to set DRC\n"); | 353 | snd_printk(KERN_ERR "failed to set DRC\n"); |
354 | return -EINVAL; | 354 | return -EINVAL; |
355 | } | 355 | } |
356 | return 0; | 356 | return 0; |
@@ -386,7 +386,7 @@ static int snapper_set_drc(struct pmac_tumbler *mix) | |||
386 | 386 | ||
387 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, | 387 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, |
388 | 6, val) < 0) { | 388 | 6, val) < 0) { |
389 | snd_printk("failed to set DRC\n"); | 389 | snd_printk(KERN_ERR "failed to set DRC\n"); |
390 | return -EINVAL; | 390 | return -EINVAL; |
391 | } | 391 | } |
392 | return 0; | 392 | return 0; |
@@ -506,7 +506,8 @@ static int tumbler_set_mono_volume(struct pmac_tumbler *mix, | |||
506 | block[i] = (vol >> ((info->bytes - i - 1) * 8)) & 0xff; | 506 | block[i] = (vol >> ((info->bytes - i - 1) * 8)) & 0xff; |
507 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, info->reg, | 507 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, info->reg, |
508 | info->bytes, block) < 0) { | 508 | info->bytes, block) < 0) { |
509 | snd_printk("failed to set mono volume %d\n", info->index); | 509 | snd_printk(KERN_ERR "failed to set mono volume %d\n", |
510 | info->index); | ||
510 | return -EINVAL; | 511 | return -EINVAL; |
511 | } | 512 | } |
512 | return 0; | 513 | return 0; |
@@ -643,7 +644,7 @@ static int snapper_set_mix_vol1(struct pmac_tumbler *mix, int idx, int ch, int r | |||
643 | } | 644 | } |
644 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, reg, | 645 | if (i2c_smbus_write_i2c_block_data(mix->i2c.client, reg, |
645 | 9, block) < 0) { | 646 | 9, block) < 0) { |
646 | snd_printk("failed to set mono volume %d\n", reg); | 647 | snd_printk(KERN_ERR "failed to set mono volume %d\n", reg); |
647 | return -EINVAL; | 648 | return -EINVAL; |
648 | } | 649 | } |
649 | return 0; | 650 | return 0; |