]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: HDA patch_via.c: cleanup
authorHarald Welte <HaraldWelte@viatech.com>
Tue, 9 Sep 2008 07:40:38 +0000 (15:40 +0800)
committerJaroslav Kysela <perex@perex.cz>
Tue, 9 Sep 2008 16:51:58 +0000 (18:51 +0200)
* add extra parenthesis to make code more readable
* use kzalloc() for alloc+zero rather than kcalloc()
* ensure that AUTO_SEQ_* starts at 0

Signed-off-by: Harald Welte <HaraldWelte@viatech.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
sound/pci/hda/patch_via.c

index e7e43524f8c732faeed283d6a223d30c918e5366..3e148373334db6578203fdb9418c78dd5b727006 100644 (file)
@@ -77,7 +77,7 @@ enum {
 };
 
 enum {
-       AUTO_SEQ_FRONT,
+       AUTO_SEQ_FRONT = 0,
        AUTO_SEQ_SURROUND,
        AUTO_SEQ_CENLFE,
        AUTO_SEQ_SIDE
@@ -283,11 +283,11 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
                return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
                                             0x18, &spec->cur_mux[adc_idx]);
        else if ((IS_VT1709_10CH_VENDORID(vendor_id) ||
-                 IS_VT1709_6CH_VENDORID(vendor_id)) && adc_idx == 0)
+                 IS_VT1709_6CH_VENDORID(vendor_id)) && (adc_idx == 0))
                return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
                                             0x19, &spec->cur_mux[adc_idx]);
        else if ((IS_VT1708B_8CH_VENDORID(vendor_id) ||
-                 IS_VT1708B_4CH_VENDORID(vendor_id)) && adc_idx == 0)
+                 IS_VT1708B_4CH_VENDORID(vendor_id)) && (adc_idx == 0))
                return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
                                             0x17, &spec->cur_mux[adc_idx]);
        else
@@ -897,7 +897,7 @@ static int patch_vt1708(struct hda_codec *codec)
        int err;
 
        /* create a codec specific record */
-       spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
        if (spec == NULL)
                return -ENOMEM;
 
@@ -1360,7 +1360,7 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
        int err;
 
        /* create a codec specific record */
-       spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
        if (spec == NULL)
                return -ENOMEM;
 
@@ -1451,7 +1451,7 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
        int err;
 
        /* create a codec specific record */
-       spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
        if (spec == NULL)
                return -ENOMEM;
 
@@ -1890,7 +1890,7 @@ static int patch_vt1708B_8ch(struct hda_codec *codec)
        int err;
 
        /* create a codec specific record */
-       spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
        if (spec == NULL)
                return -ENOMEM;
 
@@ -1939,7 +1939,7 @@ static int patch_vt1708B_4ch(struct hda_codec *codec)
        int err;
 
        /* create a codec specific record */
-       spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
        if (spec == NULL)
                return -ENOMEM;