Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / solo6x10 / solo6010-g723.c

diff --git a/drivers/staging/solo6x10/solo6010-g723.c b/drivers/staging/solo6x10/solo6010-g723.c
index 82fbcb8458785b3bd0fe705b10cf947de19af3cf..254b46ab20c5085ea35901774affd0a90af94e94 100644 (file)
--- a/drivers/staging/solo6x10/solo6010-g723.c
+++ b/drivers/staging/solo6x10/solo6010-g723.c
@@ -47,7 +47,7 @@
  * is broken down to 20 * 48 byte regions (one for each channel possible)
  * with the rest of the page being dummy data. */
 #define MAX_BUFFER             (G723_PERIOD_BYTES * PERIODS_MAX)
-#define IRQ_PAGES              4 // 0 - 4
+#define IRQ_PAGES              4 /* 0 - 4 */
 #define PERIODS_MIN            (1 << IRQ_PAGES)
 #define PERIODS_MAX            G723_FDMA_PAGES
 
@@ -158,7 +158,7 @@ static int snd_solo_pcm_close(struct snd_pcm_substream *ss)
        snd_pcm_substream_chip(ss) = solo_pcm->solo_dev;
        kfree(solo_pcm);
 
-        return 0;
+       return 0;
 }
 
 static int snd_solo_pcm_trigger(struct snd_pcm_substream *ss, int cmd)
@@ -197,7 +197,7 @@ static int snd_solo_pcm_trigger(struct snd_pcm_substream *ss, int cmd)
 
 static int snd_solo_pcm_prepare(struct snd_pcm_substream *ss)
 {
-        return 0;
+       return 0;
 }
 
 static snd_pcm_uframes_t snd_solo_pcm_pointer(struct snd_pcm_substream *ss)
@@ -271,7 +271,7 @@ static int snd_solo_capture_volume_get(struct snd_kcontrol *kcontrol,
 
        value->value.integer.value[0] = tw28_get_audio_gain(solo_dev, ch);
 
-        return 0;
+       return 0;
 }
 
 static int snd_solo_capture_volume_put(struct snd_kcontrol *kcontrol,
@@ -279,15 +279,15 @@ static int snd_solo_capture_volume_put(struct snd_kcontrol *kcontrol,
 {
        struct solo6010_dev *solo_dev = snd_kcontrol_chip(kcontrol);
        u8 ch = value->id.numid - 1;
-        u8 old_val;
+       u8 old_val;
 
-        old_val = tw28_get_audio_gain(solo_dev, ch);
+       old_val = tw28_get_audio_gain(solo_dev, ch);
        if (old_val == value->value.integer.value[0])
                return 0;
 
        tw28_set_audio_gain(solo_dev, ch, value->value.integer.value[0]);
 
-        return 1;
+       return 1;
 }
 
 static struct snd_kcontrol_new snd_solo_capture_volume = {
@@ -368,14 +368,16 @@ int solo_g723_init(struct solo6010_dev *solo_dev)
        strcpy(card->mixername, "SOLO-6010");
        kctl = snd_solo_capture_volume;
        kctl.count = solo_dev->nr_chans;
-        ret = snd_ctl_add(card, snd_ctl_new1(&kctl, solo_dev));
+       ret = snd_ctl_add(card, snd_ctl_new1(&kctl, solo_dev));
        if (ret < 0)
                return ret;
 
-       if ((ret = solo_snd_pcm_init(solo_dev)) < 0)
+       ret = solo_snd_pcm_init(solo_dev);
+       if (ret < 0)
                goto snd_error;
 
-       if ((ret = snd_card_register(card)) < 0)
+       ret = snd_card_register(card);
+       if (ret < 0)
                goto snd_error;
 
        solo_g723_config(solo_dev);