diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-08-17 10:23:07 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-09-23 04:41:19 -0400 |
commit | 7cf0a95310f21f3c986288a483801b1d5694dee1 (patch) | |
tree | 74325a39a8ac88c8674c21e71f0e6f4fb90f37a2 | |
parent | 99ccc560b73ff7381153dc1391d18391373931d3 (diff) |
[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>
-rw-r--r-- | sound/pci/ca0106/ca0106_mixer.c | 4 | ||||
-rw-r--r-- | sound/pci/emu10k1/p16v.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/hda_local.h | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_analog.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index 6d64438cecc9..9855f528ea78 100644 --- 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, | |||
478 | .info = snd_ca0106_volume_info, \ | 478 | .info = snd_ca0106_volume_info, \ |
479 | .get = snd_ca0106_volume_get, \ | 479 | .get = snd_ca0106_volume_get, \ |
480 | .put = snd_ca0106_volume_put, \ | 480 | .put = snd_ca0106_volume_put, \ |
481 | .tlv.p = snd_ca0106_db_scale1, \ | 481 | .tlv = { .p = snd_ca0106_db_scale1 }, \ |
482 | .private_value = ((chid) << 8) | (reg) \ | 482 | .private_value = ((chid) << 8) | (reg) \ |
483 | } | 483 | } |
484 | 484 | ||
@@ -490,7 +490,7 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol, | |||
490 | .info = snd_ca0106_i2c_volume_info, \ | 490 | .info = snd_ca0106_i2c_volume_info, \ |
491 | .get = snd_ca0106_i2c_volume_get, \ | 491 | .get = snd_ca0106_i2c_volume_get, \ |
492 | .put = snd_ca0106_i2c_volume_put, \ | 492 | .put = snd_ca0106_i2c_volume_put, \ |
493 | .tlv.p = snd_ca0106_db_scale2, \ | 493 | .tlv = { .p = snd_ca0106_db_scale2 }, \ |
494 | .private_value = chid \ | 494 | .private_value = chid \ |
495 | } | 495 | } |
496 | 496 | ||
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c index 1e44714b8623..4e0f95438f47 100644 --- 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); | |||
794 | .info = snd_p16v_volume_info, \ | 794 | .info = snd_p16v_volume_info, \ |
795 | .get = snd_p16v_volume_get, \ | 795 | .get = snd_p16v_volume_get, \ |
796 | .put = snd_p16v_volume_put, \ | 796 | .put = snd_p16v_volume_put, \ |
797 | .tlv.p = snd_p16v_db_scale1, \ | 797 | .tlv = { .p = snd_p16v_db_scale1 }, \ |
798 | .private_value = ((xreg) | ((xhl) << 8)) \ | 798 | .private_value = ((xreg) | ((xhl) << 8)) \ |
799 | } | 799 | } |
800 | 800 | ||
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 0f0ae685a9c1..ff24266fe353 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
@@ -36,7 +36,7 @@ | |||
36 | .info = snd_hda_mixer_amp_volume_info, \ | 36 | .info = snd_hda_mixer_amp_volume_info, \ |
37 | .get = snd_hda_mixer_amp_volume_get, \ | 37 | .get = snd_hda_mixer_amp_volume_get, \ |
38 | .put = snd_hda_mixer_amp_volume_put, \ | 38 | .put = snd_hda_mixer_amp_volume_put, \ |
39 | .tlv.c = snd_hda_mixer_amp_tlv, \ | 39 | .tlv = { .c = snd_hda_mixer_amp_tlv }, \ |
40 | .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) } | 40 | .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) } |
41 | /* stereo volume with index */ | 41 | /* stereo volume with index */ |
42 | #define HDA_CODEC_VOLUME_IDX(xname, xcidx, nid, xindex, direction) \ | 42 | #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 077f1ce01ee1..043256c67d1f 100644 --- 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[] = { | |||
507 | .info = ad1986a_pcm_amp_vol_info, | 507 | .info = ad1986a_pcm_amp_vol_info, |
508 | .get = ad1986a_pcm_amp_vol_get, | 508 | .get = ad1986a_pcm_amp_vol_get, |
509 | .put = ad1986a_pcm_amp_vol_put, | 509 | .put = ad1986a_pcm_amp_vol_put, |
510 | .tlv.c = ad1986a_pcm_amp_tlv, | 510 | .tlv = { .c = ad1986a_pcm_amp_tlv }, |
511 | .private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT) | 511 | .private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT) |
512 | }, | 512 | }, |
513 | { | 513 | { |