]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: powermac - Add missing KERN_* prefix to printk
authorTakashi Iwai <tiwai@suse.de>
Thu, 5 Feb 2009 15:02:46 +0000 (16:02 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 9 Mar 2009 13:58:31 +0000 (14:58 +0100)
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/ppc/daca.c
sound/ppc/pmac.c
sound/ppc/powermac.c
sound/ppc/tumbler.c

index 8a5b29031933a09f1a9d1ef047ee2a1db93364c4..f8d478c2da62b252d719b067ddff75805a8aa561 100644 (file)
@@ -82,7 +82,7 @@ static int daca_set_volume(struct pmac_daca *mix)
        data[1] |= mix->deemphasis ? 0x40 : 0;
        if (i2c_smbus_write_block_data(mix->i2c.client, DACA_REG_AVOL,
                                       2, data) < 0) {
-               snd_printk("failed to set volume \n");
+               snd_printk(KERN_ERR "failed to set volume \n");
                return -EINVAL;
        }
        return 0;
index bd8f92b1c224ed10034780aa71ffacee567d0cbd..9b4e9c316695e2b44cc08099427d3cf015695876 100644 (file)
@@ -299,7 +299,7 @@ static int snd_pmac_pcm_trigger(struct snd_pmac *chip, struct pmac_stream *rec,
        case SNDRV_PCM_TRIGGER_SUSPEND:
                spin_lock(&chip->reg_lock);
                rec->running = 0;
-               /*printk("stopped!!\n");*/
+               /*printk(KERN_DEBUG "stopped!!\n");*/
                snd_pmac_dma_stop(rec);
                for (i = 0, cp = rec->cmd.cmds; i < rec->nperiods; i++, cp++)
                        out_le16(&cp->command, DBDMA_STOP);
@@ -334,7 +334,7 @@ static snd_pcm_uframes_t snd_pmac_pcm_pointer(struct snd_pmac *chip,
        }
 #endif
        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);
 }
 
@@ -486,7 +486,7 @@ static void snd_pmac_pcm_update(struct snd_pmac *chip, struct pmac_stream *rec)
                        if (! (stat & ACTIVE))
                                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->req_count, rec->period_size);
                        /*st_le16(&cp->res_count, 0);*/
@@ -806,7 +806,7 @@ snd_pmac_ctrl_intr(int irq, void *devid)
        struct snd_pmac *chip = devid;
        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) {
                /* do something when headphone is plugged/unplugged? */
                if (chip->update_automute)
index c936225771ba0cd8381686c3c6b7424f288b051a..e9b02d974350532cae70ebbce704f816b266a603 100644 (file)
@@ -110,7 +110,7 @@ static int __init snd_pmac_probe(struct platform_device *devptr)
                        goto __error;
                break;
        default:
-               snd_printk("unsupported hardware %d\n", chip->model);
+               snd_printk(KERN_ERR "unsupported hardware %d\n", chip->model);
                err = -EINVAL;
                goto __error;
        }
index 3eb2233854166e06a7c532f9ec2d555020c7d567..40222fcc08783048bd56c06659d027cdb903ce54 100644 (file)
@@ -41,7 +41,7 @@
 #undef DEBUG
 
 #ifdef DEBUG
-#define DBG(fmt...) printk(fmt)
+#define DBG(fmt...) printk(KERN_DEBUG fmt)
 #else
 #define DBG(fmt...)
 #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,
                                           block) < 0) {
-               snd_printk("failed to set volume \n");
+               snd_printk(KERN_ERR "failed to set volume \n");
                return -EINVAL;
        }
        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,
                                           2, val) < 0) {
-               snd_printk("failed to set DRC\n");
+               snd_printk(KERN_ERR "failed to set DRC\n");
                return -EINVAL;
        }
        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,
                                           6, val) < 0) {
-               snd_printk("failed to set DRC\n");
+               snd_printk(KERN_ERR "failed to set DRC\n");
                return -EINVAL;
        }
        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;
        if (i2c_smbus_write_i2c_block_data(mix->i2c.client, info->reg,
                                           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 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,
                                           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 0;