1 files changed, 2 insertions, 14 deletions

diff --git a/sound/pci/echoaudio/mia_dsp.c b/sound/pci/echoaudio/mia_dsp.c
index 227386602f9b..551405114cbc 100644
--- a/sound/pci/echoaudio/mia_dsp.c
+++ b/sound/pci/echoaudio/mia_dsp.c
@@ -69,18 +69,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         if ((err = init_line_levels(chip)))
                 return err;
 
-        /* Default routing of the virtual channels: vchannels 0-3 go to analog
-        outputs and vchannels 4-7 go to S/PDIF outputs */
-        set_vmixer_gain(chip, 0, 0, 0);
-        set_vmixer_gain(chip, 1, 1, 0);
-        set_vmixer_gain(chip, 0, 2, 0);
-        set_vmixer_gain(chip, 1, 3, 0);
-        set_vmixer_gain(chip, 2, 4, 0);
-        set_vmixer_gain(chip, 3, 5, 0);
-        set_vmixer_gain(chip, 2, 6, 0);
-        set_vmixer_gain(chip, 3, 7, 0);
-        err = update_vmixer_level(chip);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
@@ -222,10 +210,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)
         DE_ACT(("set_professional_spdif %d\n", prof));
         if (prof)
                 chip->comm_page->flags |=
-                        __constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                        cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
         else
                 chip->comm_page->flags &=
-                        ~__constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                        ~cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
         chip->professional_spdif = prof;
         return update_flags(chip);
 }