[ALSA] Fix compile errors with older gcc

Fixed compile errors with older gcc for initialization of a union.
sound/pci/ca0106/ca0106_mixer.c: At top level:
sound/pci/ca0106/ca0106_mixer.c:499: unknown field 'p' specified in initializer
sound/pci/ca0106/ca0106_mixer.c:499: warning: missing braces around initializer
sound/pci/ca0106/ca0106_mixer.c:499: warning: (near initialization for 'snd_ca0106_volume_ctls[0].tlv')

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 6d64438cecc92ea24937774626071cdb6ed6160f..9855f528ea78173aeec031472bd7876aa5590b0a 100644 (file)
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -478,7 +478,7 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol,
        .info =  snd_ca0106_volume_info,                        \
        .get =   snd_ca0106_volume_get,                         \
        .put =   snd_ca0106_volume_put,                         \
-       .tlv.p = snd_ca0106_db_scale1,                          \
+       .tlv = { .p = snd_ca0106_db_scale1 },                   \
        .private_value = ((chid) << 8) | (reg)                  \
 }
 
@@ -490,7 +490,7 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol,
        .info =  snd_ca0106_i2c_volume_info,                    \
        .get =   snd_ca0106_i2c_volume_get,                     \
        .put =   snd_ca0106_i2c_volume_put,                     \
-       .tlv.p = snd_ca0106_db_scale2,                          \
+       .tlv = { .p = snd_ca0106_db_scale2 },                   \
        .private_value = chid                                   \
 }
 

diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 1e44714b86236c100fb539377038d67f2676182f..4e0f95438f47e3045c2b8e84949fa5b2a3ba01ba 100644 (file)
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -794,7 +794,7 @@ static DECLARE_TLV_DB_SCALE(snd_p16v_db_scale1, -5175, 25, 1);
        .info = snd_p16v_volume_info, \
        .get = snd_p16v_volume_get, \
        .put = snd_p16v_volume_put, \
-       .tlv.p = snd_p16v_db_scale1, \
+       .tlv = { .p = snd_p16v_db_scale1 },     \
        .private_value = ((xreg) | ((xhl) << 8)) \
 }
 

diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 0f0ae685a9c171cb2ac97e0e851e34e5ebd9800d..ff24266fe353bdac0950dc50ba167ac96fbfc655 100644 (file)
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -36,7 +36,7 @@
          .info = snd_hda_mixer_amp_volume_info, \
          .get = snd_hda_mixer_amp_volume_get, \
          .put = snd_hda_mixer_amp_volume_put, \
-         .tlv.c = snd_hda_mixer_amp_tlv, \
+         .tlv = { .c = snd_hda_mixer_amp_tlv },                \
          .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }
 /* stereo volume with index */
 #define HDA_CODEC_VOLUME_IDX(xname, xcidx, nid, xindex, direction) \

diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 077f1ce01ee11f4923c0f6ff6d593979f41ec9b7..043256c67d1f68469f2f65fe4f7df11c08de9776 100644 (file)
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -507,7 +507,7 @@ static struct snd_kcontrol_new ad1986a_mixers[] = {
                .info = ad1986a_pcm_amp_vol_info,
                .get = ad1986a_pcm_amp_vol_get,
                .put = ad1986a_pcm_amp_vol_put,
-               .tlv.c = ad1986a_pcm_amp_tlv,
+               .tlv = { .c = ad1986a_pcm_amp_tlv },
                .private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT)
        },
        {