ALSA: echoaudio: remove all snd_printk

[deliverable/linux.git] / sound / pci / echoaudio / layla24_dsp.c

diff --git a/sound/pci/echoaudio/layla24_dsp.c b/sound/pci/echoaudio/layla24_dsp.c
index 8c041647f285e0fe44afb3eb853c96c6dd27dac7..eb8f218f79fed225a3714fa9ca3a06d4a2be3680 100644 (file)
--- a/sound/pci/echoaudio/layla24_dsp.c
+++ b/sound/pci/echoaudio/layla24_dsp.c
@@ -40,12 +40,13 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
 {
        int err;
 
-       DE_INIT(("init_hw() - Layla24\n"));
+       dev_dbg(chip->card->dev, "init_hw() - Layla24\n");
        if (snd_BUG_ON((subdevice_id & 0xfff0) != LAYLA24))
                return -ENODEV;
 
        if ((err = init_dsp_comm_page(chip))) {
-               DE_INIT(("init_hw - could not initialize DSP comm page\n"));
+               dev_err(chip->card->dev,
+                       "init_hw - could not initialize DSP comm page\n");
                return err;
        }
 
@@ -69,7 +70,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
        if ((err = init_line_levels(chip)) < 0)
                return err;
 
-       DE_INIT(("init_hw done\n"));
+       dev_dbg(chip->card->dev, "init_hw done\n");
        return err;
 }
 
@@ -117,7 +118,7 @@ static int load_asic(struct echoaudio *chip)
        if (chip->asic_loaded)
                return 1;
 
-       DE_INIT(("load_asic\n"));
+       dev_dbg(chip->card->dev, "load_asic\n");
 
        /* Give the DSP a few milliseconds to settle down */
        mdelay(10);
@@ -151,7 +152,7 @@ static int load_asic(struct echoaudio *chip)
                err = write_control_reg(chip, GML_CONVERTER_ENABLE | GML_48KHZ,
                                        TRUE);
        
-       DE_INIT(("load_asic() done\n"));
+       dev_dbg(chip->card->dev, "load_asic() done\n");
        return err;
 }
 
@@ -167,8 +168,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)
 
        /* Only set the clock for internal mode. */
        if (chip->input_clock != ECHO_CLOCK_INTERNAL) {
-               DE_ACT(("set_sample_rate: Cannot set sample rate - "
-                       "clock not set to CLK_CLOCKININTERNAL\n"));
+               dev_warn(chip->card->dev,
+                        "Cannot set sample rate - clock not set to CLK_CLOCKININTERNAL\n");
                /* Save the rate anyhow */
                chip->comm_page->sample_rate = cpu_to_le32(rate);
                chip->sample_rate = rate;
@@ -241,7 +242,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)
 
        chip->comm_page->sample_rate = cpu_to_le32(rate);       /* ignored by the DSP ? */
        chip->sample_rate = rate;
-       DE_ACT(("set_sample_rate: %d clock %d\n", rate, control_reg));
+       dev_dbg(chip->card->dev,
+               "set_sample_rate: %d clock %d\n", rate, control_reg);
 
        return write_control_reg(chip, control_reg, FALSE);
 }
@@ -260,7 +262,7 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)
        /* Pick the new clock */
        switch (clock) {
        case ECHO_CLOCK_INTERNAL:
-               DE_ACT(("Set Layla24 clock to INTERNAL\n"));
+               dev_dbg(chip->card->dev, "Set Layla24 clock to INTERNAL\n");
                chip->input_clock = ECHO_CLOCK_INTERNAL;
                return set_sample_rate(chip, chip->sample_rate);
        case ECHO_CLOCK_SPDIF:
@@ -269,7 +271,7 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)
                control_reg |= GML_SPDIF_CLOCK;
                /* Layla24 doesn't support 96KHz S/PDIF */
                control_reg &= ~GML_DOUBLE_SPEED_MODE;
-               DE_ACT(("Set Layla24 clock to SPDIF\n"));
+               dev_dbg(chip->card->dev, "Set Layla24 clock to SPDIF\n");
                break;
        case ECHO_CLOCK_WORD:
                control_reg |= GML_WORD_CLOCK;
@@ -277,17 +279,18 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)
                        control_reg |= GML_DOUBLE_SPEED_MODE;
                else
                        control_reg &= ~GML_DOUBLE_SPEED_MODE;
-               DE_ACT(("Set Layla24 clock to WORD\n"));
+               dev_dbg(chip->card->dev, "Set Layla24 clock to WORD\n");
                break;
        case ECHO_CLOCK_ADAT:
                if (chip->digital_mode != DIGITAL_MODE_ADAT)
                        return -EAGAIN;
                control_reg |= GML_ADAT_CLOCK;
                control_reg &= ~GML_DOUBLE_SPEED_MODE;
-               DE_ACT(("Set Layla24 clock to ADAT\n"));
+               dev_dbg(chip->card->dev, "Set Layla24 clock to ADAT\n");
                break;
        default:
-               DE_ACT(("Input clock 0x%x not supported for Layla24\n", clock));
+               dev_err(chip->card->dev,
+                       "Input clock 0x%x not supported for Layla24\n", clock);
                return -EINVAL;
        }
 
@@ -353,7 +356,8 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)
                asic = FW_LAYLA24_2A_ASIC;
                break;
        default:
-               DE_ACT(("Digital mode not supported: %d\n", mode));
+               dev_err(chip->card->dev,
+                       "Digital mode not supported: %d\n", mode);
                return -EINVAL;
        }
 
@@ -393,6 +397,6 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)
                return err;
        chip->digital_mode = mode;
 
-       DE_ACT(("set_digital_mode to %d\n", mode));
+       dev_dbg(chip->card->dev, "set_digital_mode to %d\n", mode);
        return incompatible_clock;
 }