[PATCH] ALSA update [5/12] - 2002/08/15

  - C99 structure initializers - second set of changes
  - USB MIDI driver
    - more device info for Roland/EDIROL devices

46 files changed, 1934 insertions, 1914 deletions

diff --git a/include/sound/version.h b/include/sound/version.h
index 953c65df48aa..b13680ba6d57 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h.  Generated automatically by configure.  */
-#define CONFIG_SND_VERSION "0.9.0rc2"
-#define CONFIG_SND_DATE " (Wed Aug 14 17:22:18 2002 UTC)"
+#define CONFIG_SND_VERSION "0.9.0rc3"
+#define CONFIG_SND_DATE " (Thu Aug 15 19:10:53 2002 UTC)"
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 48dbf94f78a7..5e210e9dfb1f 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -383,17 +383,17 @@ int snd_mixer_oss_ioctl_card(snd_card_t *card, unsigned int cmd, unsigned long a
 static struct file_operations snd_mixer_oss_f_ops =
 {
 #ifndef LINUX_2_2
-	owner:		THIS_MODULE,
+	.owner =	THIS_MODULE,
 #endif
-	open:		snd_mixer_oss_open,
-	release:	snd_mixer_oss_release,
-	ioctl:		snd_mixer_oss_ioctl,
+	.open =		snd_mixer_oss_open,
+	.release =	snd_mixer_oss_release,
+	.ioctl =	snd_mixer_oss_ioctl,
 };
 
 static snd_minor_t snd_mixer_oss_reg =
 {
-	comment:	"mixer",
-	f_ops:		&snd_mixer_oss_f_ops,
+	.comment =	"mixer",
+	.f_ops =	&snd_mixer_oss_f_ops,
 };
 
 /*
diff --git a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c
index daf5ff4c8305..97facb47b564 100644
--- a/sound/i2c/l3/uda1341.c
+++ b/sound/i2c/l3/uda1341.c
@@ -16,7 +16,7 @@
  * 2002-04-12	Tomas Kasparek	Proc interface update, code cleanup
  */
 
-/* $Id: uda1341.c,v 1.3 2002/08/13 16:13:36 perex Exp $ */
+/* $Id: uda1341.c,v 1.4 2002/08/15 12:13:06 perex Exp $ */
 
 #include <sound/driver.h>
 #include <linux/module.h>
@@ -459,9 +459,9 @@ static void snd_uda1341_proc_done(struct l3_client *clnt)
 /* {{{ UDA1341 single functions */
 
 #define UDA1341_SINGLE(xname, where, reg, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_uda1341_info_single, \
-  .get = snd_uda1341_get_single, put: snd_uda1341_put_single, \
-  private_value: where | reg << 5 | (shift << 9) | (mask << 12) | (invert << 18) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_uda1341_info_single, \
+  .get = snd_uda1341_get_single, .put = snd_uda1341_put_single, \
+  .private_value = where | reg << 5 | (shift << 9) | (mask << 12) | (invert << 18) \
 }
 
 static int snd_uda1341_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -521,9 +521,9 @@ static int snd_uda1341_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
 /* {{{ UDA1341 enum functions */
 
 #define UDA1341_ENUM(xname, where, reg, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_uda1341_info_enum, \
-  .get = snd_uda1341_get_enum, put: snd_uda1341_put_enum, \
-  private_value: where | reg << 5 | (shift << 9) | (mask << 12) | (invert << 18) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_uda1341_info_enum, \
+  .get = snd_uda1341_get_enum, .put = snd_uda1341_put_enum, \
+  .private_value = where | reg << 5 | (shift << 9) | (mask << 12) | (invert << 18) \
 }
 
 static int snd_uda1341_info_enum(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -583,9 +583,9 @@ static int snd_uda1341_put_enum(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 /* {{{ UDA1341 2regs functions */
 
 #define UDA1341_2REGS(xname, where, reg_1, reg_2, shift_1, shift_2, mask_1, mask_2, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: (xname), info: snd_uda1341_info_2regs, \
-  .get = snd_uda1341_get_2regs, put: snd_uda1341_put_2regs, \
-  private_value: where | (reg_1 << 5) | (reg_2 << 9) | (shift_1 << 13) | (shift_2 << 16) | \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), .info = snd_uda1341_info_2regs, \
+  .get = snd_uda1341_get_2regs, .put = snd_uda1341_put_2regs, \
+  .private_value = where | (reg_1 << 5) | (reg_2 << 9) | (shift_1 << 13) | (shift_2 << 16) | \
                          (mask_1 << 19) | (mask_2 << 25) | (invert << 31) \
 }
 
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c
index 767e1b4fc93d..5c0535489015 100644
--- a/sound/i2c/tea6330t.c
+++ b/sound/i2c/tea6330t.c
@@ -67,9 +67,9 @@ static void snd_tea6330t_set(tea6330t_t *tea,
 #endif
 
 #define TEA6330T_MASTER_VOLUME(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_tea6330t_info_master_volume, \
-  .get = snd_tea6330t_get_master_volume, put: snd_tea6330t_put_master_volume }
+  .get = snd_tea6330t_get_master_volume, .put = snd_tea6330t_put_master_volume }
 
 static int snd_tea6330t_info_master_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -123,9 +123,9 @@ static int snd_tea6330t_put_master_volume(snd_kcontrol_t * kcontrol, snd_ctl_ele
 }
 
 #define TEA6330T_MASTER_SWITCH(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_tea6330t_info_master_switch, \
-  .get = snd_tea6330t_get_master_switch, put: snd_tea6330t_put_master_switch }
+  .get = snd_tea6330t_get_master_switch, .put = snd_tea6330t_put_master_switch }
 
 static int snd_tea6330t_info_master_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -172,9 +172,9 @@ static int snd_tea6330t_put_master_switch(snd_kcontrol_t * kcontrol, snd_ctl_ele
 }
 
 #define TEA6330T_BASS(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_tea6330t_info_bass, \
-  .get = snd_tea6330t_get_bass, put: snd_tea6330t_put_bass }
+  .get = snd_tea6330t_get_bass, .put = snd_tea6330t_put_bass }
 
 static int snd_tea6330t_info_bass(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -216,9 +216,9 @@ static int snd_tea6330t_put_bass(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define TEA6330T_TREBLE(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_tea6330t_info_treble, \
-  .get = snd_tea6330t_get_treble, put: snd_tea6330t_put_treble }
+  .get = snd_tea6330t_get_treble, .put = snd_tea6330t_put_treble }
 
 static int snd_tea6330t_info_treble(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index 50f713c64ddd..f66ed0956757 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -366,10 +366,10 @@ int snd_cs4236_pcm(cs4231_t *chip, int device, snd_pcm_t **rpcm)
  */
 
 #define CS4236_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_cs4236_info_single, \
-  .get = snd_cs4236_get_single, put: snd_cs4236_put_single, \
-  private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
+  .get = snd_cs4236_get_single, .put = snd_cs4236_put_single, \
+  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
 static int snd_cs4236_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -423,10 +423,10 @@ static int snd_cs4236_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define CS4236_SINGLEC(xname, xindex, reg, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_cs4236_info_single, \
-  .get = snd_cs4236_get_singlec, put: snd_cs4236_put_singlec, \
-  private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
+  .get = snd_cs4236_get_singlec, .put = snd_cs4236_put_singlec, \
+  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
 static int snd_cs4236_get_singlec(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
@@ -469,10 +469,10 @@ static int snd_cs4236_put_singlec(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
 }
 
 #define CS4236_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_cs4236_info_double, \
-  .get = snd_cs4236_get_double, put: snd_cs4236_put_double, \
-  private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
+  .get = snd_cs4236_get_double, .put = snd_cs4236_put_double, \
+  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
 
 static int snd_cs4236_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -545,10 +545,10 @@ static int snd_cs4236_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define CS4236_DOUBLE1(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_cs4236_info_double, \
-  .get = snd_cs4236_get_double1, put: snd_cs4236_put_double1, \
-  private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
+  .get = snd_cs4236_get_double1, .put = snd_cs4236_put_double1, \
+  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
 
 static int snd_cs4236_get_double1(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
@@ -604,10 +604,10 @@ static int snd_cs4236_put_double1(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
 }
 
 #define CS4236_MASTER_DIGITAL(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_cs4236_info_double, \
-  .get = snd_cs4236_get_master_digital, put: snd_cs4236_put_master_digital, \
-  private_value: 71 << 24 }
+  .get = snd_cs4236_get_master_digital, .put = snd_cs4236_put_master_digital, \
+  .private_value = 71 << 24 }
 
 static inline int snd_cs4236_mixer_master_digital_invert_volume(int vol)
 {
@@ -646,10 +646,10 @@ static int snd_cs4236_put_master_digital(snd_kcontrol_t * kcontrol, snd_ctl_elem
 }
 
 #define CS4235_OUTPUT_ACCU(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_cs4236_info_double, \
-  .get = snd_cs4235_get_output_accu, put: snd_cs4235_put_output_accu, \
-  private_value: 3 << 24 }
+  .get = snd_cs4235_get_output_accu, .put = snd_cs4235_put_output_accu, \
+  .private_value = 3 << 24 }
 
 static inline int snd_cs4235_mixer_output_accu_get_volume(int vol)
 {
@@ -807,10 +807,10 @@ CS4231_DOUBLE("Analog Loopback Switch", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT
 };
 
 #define CS4236_IEC958_ENABLE(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_cs4236_info_single, \
-  .get = snd_cs4236_get_iec958_switch, put: snd_cs4236_put_iec958_switch, \
-  private_value: 1 << 16 }
+  .get = snd_cs4236_get_iec958_switch, .put = snd_cs4236_put_iec958_switch, \
+  .private_value = 1 << 16 }
 
 static int snd_cs4236_get_iec958_switch(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 56080d88fc89..ceb3c69f58a8 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -800,10 +800,10 @@ static int snd_es1688_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
 }
 
 #define ES1688_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_es1688_info_single, \
-  .get = snd_es1688_get_single, put: snd_es1688_put_single, \
-  private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
+  .get = snd_es1688_get_single, .put = snd_es1688_put_single, \
+  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
 static int snd_es1688_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -859,10 +859,10 @@ static int snd_es1688_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define ES1688_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_es1688_info_double, \
-  .get = snd_es1688_get_double, put: snd_es1688_put_double, \
-  private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
+  .get = snd_es1688_get_double, .put = snd_es1688_put_double, \
+  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
 
 static int snd_es1688_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
diff --git a/sound/isa/gus/gus_mixer.c b/sound/isa/gus/gus_mixer.c
index 86ead59e969e..192c78bf49b9 100644
--- a/sound/isa/gus/gus_mixer.c
+++ b/sound/isa/gus/gus_mixer.c
@@ -33,10 +33,10 @@
  */
 
 #define GF1_SINGLE(xname, xindex, shift, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_gf1_info_single, \
-  .get = snd_gf1_get_single, put: snd_gf1_put_single, \
-  private_value: shift | (invert << 8) }
+  .get = snd_gf1_get_single, .put = snd_gf1_put_single, \
+  .private_value = shift | (invert << 8) }
 
 static int snd_gf1_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -83,10 +83,10 @@ static int snd_gf1_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
 }
 
 #define ICS_DOUBLE(xname, xindex, addr) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_ics_info_double, \
-  .get = snd_ics_get_double, put: snd_ics_put_double, \
-  private_value: addr }
+  .get = snd_ics_get_double, .put = snd_ics_put_double, \
+  .private_value = addr }
 
 static int snd_ics_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c
index a89df1eb1533..1f08e1221647 100644
--- a/sound/isa/sb/sb_mixer.c
+++ b/sound/isa/sb/sb_mixer.c
@@ -65,7 +65,7 @@ unsigned char snd_sbmixer_read(sb_t *chip, unsigned char reg)
   .name = xname, \
   .info = snd_sbmixer_info_single, \
   .get = snd_sbmixer_get_single, put: snd_sbmixer_put_single, \
-  private_value: reg | (shift << 16) | (mask << 24) }
+  .private_value = reg | (shift << 16) | (mask << 24) }
 
 static int snd_sbmixer_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -124,7 +124,7 @@ static int snd_sbmixer_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
   .name = xname, \
   .info = snd_sbmixer_info_double, \
   .get = snd_sbmixer_get_double, put: snd_sbmixer_put_double, \
-  private_value: left_reg | (right_reg << 8) | (left_shift << 16) | (right_shift << 19) | (mask << 24) }
+  .private_value = left_reg | (right_reg << 8) | (left_shift << 16) | (right_shift << 19) | (mask << 24) }
 
 static int snd_sbmixer_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -367,7 +367,7 @@ static int snd_sb8mixer_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
   .name = xname, \
   .info = snd_sb16mixer_info_input_sw, \
   .get = snd_sb16mixer_get_input_sw, put: snd_sb16mixer_put_input_sw, \
-  private_value: reg1 | (reg2 << 8) | (left_shift << 16) | (right_shift << 24) }
+  .private_value = reg1 | (reg2 << 8) | (left_shift << 16) | (right_shift << 24) }
 
 static int snd_sb16mixer_info_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -529,11 +529,11 @@ SB_DOUBLE("Line Playback Switch", SB_DT019X_OUTPUT_SW1, SB_DT019X_OUTPUT_SW1, 4,
 SB_DOUBLE("PCM Playback Switch", SB_DT019X_OUTPUT_SW2, SB_DT019X_OUTPUT_SW2, 2,1, 1),
 SB_DOUBLE("Synth Playback Switch", SB_DT019X_OUTPUT_SW2, SB_DT019X_OUTPUT_SW2, 4,3, 1),
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Capture Source",
-	info: snd_dt019x_input_sw_info,
-	get: snd_dt019x_input_sw_get,
-	put: snd_dt019x_input_sw_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Capture Source",
+	.info = snd_dt019x_input_sw_info,
+	.get = snd_dt019x_input_sw_get,
+	.put = snd_dt019x_input_sw_put,
 },
 };
 
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index cf0aa5b5a650..de9cfd913b6f 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -590,11 +590,11 @@ AC97_DOUBLE("PCM Playback Volume", AC97_PCM, 8, 0, 31, 1)
 
 static const snd_kcontrol_new_t snd_ac97_controls_capture[3] = {
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Capture Source",
-	info: snd_ac97_info_mux,
-	get: snd_ac97_get_mux,
-	put: snd_ac97_put_mux,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Capture Source",
+	.info = snd_ac97_info_mux,
+	.get = snd_ac97_get_mux,
+	.put = snd_ac97_put_mux,
 },
 AC97_SINGLE("Capture Switch", AC97_REC_GAIN, 15, 1, 1),
 AC97_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 15, 0)
diff --git a/sound/pci/ac97/ak4531_codec.c b/sound/pci/ac97/ak4531_codec.c
index fb3879095838..22afe9f7d82b 100644
--- a/sound/pci/ac97/ak4531_codec.c
+++ b/sound/pci/ac97/ak4531_codec.c
@@ -56,10 +56,10 @@ static void snd_ak4531_dump(ak4531_t *ak4531)
  */
 
 #define AK4531_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_ak4531_info_single, \
-  get: snd_ak4531_get_single, put: snd_ak4531_put_single, \
-  private_value: reg | (shift << 16) | (mask << 24) | (invert << 22) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_ak4531_info_single, \
+  .get = snd_ak4531_get_single, .put = snd_ak4531_put_single, \
+  .private_value = reg | (shift << 16) | (mask << 24) | (invert << 22) }
 
 static int snd_ak4531_info_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -117,10 +117,10 @@ static int snd_ak4531_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }                                                                                                                                                                                                                                                                                                            
 
 #define AK4531_DOUBLE(xname, xindex, left_reg, right_reg, left_shift, right_shift, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_ak4531_info_double, \
-  get: snd_ak4531_get_double, put: snd_ak4531_put_double, \
-  private_value: left_reg | (right_reg << 8) | (left_shift << 16) | (right_shift << 19) | (mask << 24) | (invert << 22) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_ak4531_info_double, \
+  .get = snd_ak4531_get_double, .put = snd_ak4531_put_double, \
+  .private_value = left_reg | (right_reg << 8) | (left_shift << 16) | (right_shift << 19) | (mask << 24) | (invert << 22) }
 
 static int snd_ak4531_info_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -196,10 +196,10 @@ static int snd_ak4531_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }                                                                                                                                                                                                                                                                                                            
 
 #define AK4531_INPUT_SW(xname, xindex, reg1, reg2, left_shift, right_shift) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_ak4531_info_input_sw, \
-  get: snd_ak4531_get_input_sw, put: snd_ak4531_put_input_sw, \
-  private_value: reg1 | (reg2 << 8) | (left_shift << 16) | (right_shift << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_ak4531_info_input_sw, \
+  .get = snd_ak4531_get_input_sw, .put = snd_ak4531_put_input_sw, \
+  .private_value = reg1 | (reg2 << 8) | (left_shift << 16) | (right_shift << 24) }
 
 static int snd_ak4531_info_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -362,7 +362,7 @@ int snd_ak4531_mixer(snd_card_t * card, ak4531_t * _ak4531, ak4531_t ** rak4531)
 	int idx, err;
 	ak4531_t * ak4531;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_ak4531_dev_free,
+		.dev_free =	snd_ak4531_dev_free,
 	};
 
 	snd_assert(rak4531 != NULL, return -EINVAL);
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 0bd4c601bf2e..82a73ab3e4a9 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -1540,22 +1540,22 @@ static snd_pcm_uframes_t snd_ali_capture_pointer(snd_pcm_substream_t *substream)
 
 static snd_pcm_hardware_t snd_ali_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START),
-	formats:		(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
+	.formats =		(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
 				 SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U16_LE),
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(256*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(256*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(256*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(256*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 /*
@@ -1564,22 +1564,22 @@ static snd_pcm_hardware_t snd_ali_playback =
 
 static snd_pcm_hardware_t snd_ali_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START),
-	formats:		(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
+	.formats =		(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
 				 SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U16_LE),
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(128*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(128*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(128*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(128*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static void snd_ali_pcm_free_substream(snd_pcm_runtime_t *runtime)
@@ -1666,25 +1666,25 @@ static int snd_ali_capture_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_ali_playback_ops = {
-	open:		snd_ali_playback_open,
-	close:		snd_ali_playback_close,
-	ioctl:		snd_ali_ioctl,
-	hw_params:	snd_ali_playback_hw_params,
-	hw_free:	snd_ali_playback_hw_free,
-	prepare:	snd_ali_playback_prepare,
-	trigger:	snd_ali_trigger,
-	pointer:	snd_ali_playback_pointer,
+	.open =		snd_ali_playback_open,
+	.close =	snd_ali_playback_close,
+	.ioctl =	snd_ali_ioctl,
+	.hw_params =	snd_ali_playback_hw_params,
+	.hw_free =	snd_ali_playback_hw_free,
+	.prepare =	snd_ali_playback_prepare,
+	.trigger =	snd_ali_trigger,
+	.pointer =	snd_ali_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_ali_capture_ops = {
-	open:		snd_ali_capture_open,
-	close:		snd_ali_capture_close,
-	ioctl:		snd_ali_ioctl,
-	hw_params:	snd_ali_capture_hw_params,
-	hw_free:	snd_ali_capture_hw_free,
-	prepare:	snd_ali_capture_prepare,
-	trigger:	snd_ali_trigger,
-	pointer:	snd_ali_capture_pointer,
+	.open =		snd_ali_capture_open,
+	.close =	snd_ali_capture_close,
+	.ioctl =	snd_ali_ioctl,
+	.hw_params =	snd_ali_capture_hw_params,
+	.hw_free =	snd_ali_capture_hw_free,
+	.prepare =	snd_ali_capture_prepare,
+	.trigger =	snd_ali_trigger,
+	.pointer =	snd_ali_capture_pointer,
 };
 
 
@@ -1722,9 +1722,9 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, snd_pcm_t ** rpcm)
 }
 
 #define ALI5451_SPDIF(xname, xindex, value) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex,\
-info: snd_ali5451_spdif_info, get: snd_ali5451_spdif_get, \
-put: snd_ali5451_spdif_put, private_value: value}
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
+.info = snd_ali5451_spdif_info, .get = snd_ali5451_spdif_get, \
+.put = snd_ali5451_spdif_put, .private_value = value}
 
 static int snd_ali5451_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
 {
@@ -2240,13 +2240,13 @@ static void __devexit snd_ali_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "ALI 5451",
-	id_table: snd_ali_ids,
-	probe: snd_ali_probe,
-	remove: __devexit_p(snd_ali_remove),
+	.name = "ALI 5451",
+	.id_table = snd_ali_ids,
+	.probe = snd_ali_probe,
+	.remove = __devexit_p(snd_ali_remove),
 #ifdef CONFIG_PM
-	suspend: snd_ali_suspend,
-	resume: snd_ali_resume,
+	.suspend = snd_ali_suspend,
+	.resume = snd_ali_resume,
 #endif
 };                                
 
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 65252af95f0e..54263ad159eb 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -2506,7 +2506,7 @@ static int __devinit snd_cmipci_create(snd_card_t *card,
 	cmipci_t *cm;
 	int err;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_cmipci_dev_free,
+		.dev_free =	snd_cmipci_dev_free,
 	};
 	unsigned int val = 0;
 	int pcm_index, pcm_spdif_index;
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 48415ea2ba32..8a940a6b1299 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -1246,44 +1246,44 @@ static void snd_cs46xx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static snd_pcm_hardware_t snd_cs46xx_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP |
+	.info =			(SNDRV_PCM_INFO_MMAP |
 				 SNDRV_PCM_INFO_INTERLEAVED | 
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_RESUME),
-	formats:		(SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
+	.formats =		(SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
 				 SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE |
 				 SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_U16_BE),
-	.rates			= SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	.rate_min		= 5500,
-	.rate_max		= 48000,
-	.channels_min		= 1,
-	.channels_max		= 2,
-	.buffer_bytes_max	= (256 * 1024),
-	.period_bytes_min	= CS46XX_PERIOD_SIZE,
-	.period_bytes_max	= CS46XX_PERIOD_SIZE,
-	.periods_min		= CS46XX_FRAGS,
-	.periods_max		= 1024,
-	.fifo_size		= 0,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		5500,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(256 * 1024),
+	.period_bytes_min =	CS46XX_PERIOD_SIZE,
+	.period_bytes_max =	CS46XX_PERIOD_SIZE,
+	.periods_min =		CS46XX_FRAGS,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_cs46xx_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP |
+	.info =			(SNDRV_PCM_INFO_MMAP |
 				 SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_RESUME),
-	.formats		= SNDRV_PCM_FMTBIT_S16_LE,
-	.rates			= SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	.rate_min		= 5500,
-	.rate_max		= 48000,
-	.channels_min		= 2,
-	.channels_max		= 2,
-	.buffer_bytes_max	= (256 * 1024),
-	.period_bytes_min	= CS46XX_PERIOD_SIZE,
-	.period_bytes_max	= CS46XX_PERIOD_SIZE,
-	.periods_min		= CS46XX_FRAGS,
-	.periods_max		= 1024,
-	.fifo_size		= 0,
+	.formats =		SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		5500,
+	.rate_max =		48000,
+	.channels_min =		2,
+	.channels_max =		2,
+	.buffer_bytes_max =	(256 * 1024),
+	.period_bytes_min =	CS46XX_PERIOD_SIZE,
+	.period_bytes_max =	CS46XX_PERIOD_SIZE,
+	.periods_min =		CS46XX_FRAGS,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static void snd_cs46xx_pcm_free_substream(snd_pcm_runtime_t *runtime)
@@ -1387,49 +1387,49 @@ static int snd_cs46xx_capture_close(snd_pcm_substream_t * substream)
 }
 
 snd_pcm_ops_t snd_cs46xx_playback_ops = {
-	.open			= snd_cs46xx_playback_open,
-	.close			= snd_cs46xx_playback_close,
-	.ioctl			= snd_pcm_lib_ioctl,
-	.hw_params		= snd_cs46xx_playback_hw_params,
-	.hw_free		= snd_cs46xx_playback_hw_free,
-	.prepare		= snd_cs46xx_playback_prepare,
-	.trigger		= snd_cs46xx_playback_trigger,
-	.pointer		= snd_cs46xx_playback_direct_pointer,
+	.open =			snd_cs46xx_playback_open,
+	.close =		snd_cs46xx_playback_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_cs46xx_playback_hw_params,
+	.hw_free =		snd_cs46xx_playback_hw_free,
+	.prepare =		snd_cs46xx_playback_prepare,
+	.trigger =		snd_cs46xx_playback_trigger,
+	.pointer =		snd_cs46xx_playback_direct_pointer,
 };
 
 snd_pcm_ops_t snd_cs46xx_playback_indirect_ops = {
-	.open			= snd_cs46xx_playback_open,
-	.close			= snd_cs46xx_playback_close,
-	.ioctl			= snd_pcm_lib_ioctl,
-	.hw_params		= snd_cs46xx_playback_hw_params,
-	.hw_free		= snd_cs46xx_playback_hw_free,
-	.prepare		= snd_cs46xx_playback_prepare,
-	.trigger		= snd_cs46xx_playback_trigger,
-	.copy			= snd_cs46xx_playback_copy,
-	.pointer		= snd_cs46xx_playback_indirect_pointer,
+	.open =			snd_cs46xx_playback_open,
+	.close =		snd_cs46xx_playback_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_cs46xx_playback_hw_params,
+	.hw_free =		snd_cs46xx_playback_hw_free,
+	.prepare =		snd_cs46xx_playback_prepare,
+	.trigger =		snd_cs46xx_playback_trigger,
+	.copy =			snd_cs46xx_playback_copy,
+	.pointer =		snd_cs46xx_playback_indirect_pointer,
 };
 
 snd_pcm_ops_t snd_cs46xx_capture_ops = {
-	.open			= snd_cs46xx_capture_open,
-	.close			= snd_cs46xx_capture_close,
-	.ioctl			= snd_pcm_lib_ioctl,
-	.hw_params		= snd_cs46xx_capture_hw_params,
-	.hw_free		= snd_cs46xx_capture_hw_free,
-	.prepare		= snd_cs46xx_capture_prepare,
-	.trigger		= snd_cs46xx_capture_trigger,
-	.pointer		= snd_cs46xx_capture_direct_pointer,
+	.open =			snd_cs46xx_capture_open,
+	.close =		snd_cs46xx_capture_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_cs46xx_capture_hw_params,
+	.hw_free =		snd_cs46xx_capture_hw_free,
+	.prepare =		snd_cs46xx_capture_prepare,
+	.trigger =		snd_cs46xx_capture_trigger,
+	.pointer =		snd_cs46xx_capture_direct_pointer,
 };
 
 snd_pcm_ops_t snd_cs46xx_capture_indirect_ops = {
-	.open			= snd_cs46xx_capture_open,
-	.close			= snd_cs46xx_capture_close,
-	.ioctl			= snd_pcm_lib_ioctl,
-	.hw_params		= snd_cs46xx_capture_hw_params,
-	.hw_free		= snd_cs46xx_capture_hw_free,
-	.prepare		= snd_cs46xx_capture_prepare,
-	.trigger		= snd_cs46xx_capture_trigger,
-	.copy			= snd_cs46xx_capture_copy,
-	.pointer		= snd_cs46xx_capture_indirect_pointer,
+	.open =			snd_cs46xx_capture_open,
+	.close =		snd_cs46xx_capture_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_cs46xx_capture_hw_params,
+	.hw_free =		snd_cs46xx_capture_hw_free,
+	.prepare =		snd_cs46xx_capture_prepare,
+	.trigger =		snd_cs46xx_capture_trigger,
+	.copy =			snd_cs46xx_capture_copy,
+	.pointer =		snd_cs46xx_capture_indirect_pointer,
 };
 
 static void snd_cs46xx_pcm_free(snd_pcm_t *pcm)
@@ -1768,103 +1768,103 @@ static int snd_cs46xx_egpio_put(snd_kcontrol_t *kcontrol,
 
 static snd_kcontrol_new_t snd_cs46xx_controls[] __devinitdata = {
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "DAC Volume",
-	info: snd_cs46xx_vol_info,
-	get: snd_cs46xx_vol_get,
-	put: snd_cs46xx_vol_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "DAC Volume",
+	.info = snd_cs46xx_vol_info,
+	.get = snd_cs46xx_vol_get,
+	.put = snd_cs46xx_vol_put,
 
 #ifndef CONFIG_SND_CS46XX_NEW_DSP
-	private_value: BA1_PVOL,
+	.private_value = BA1_PVOL,
 #else
-	private_value: (MASTERMIX_SCB_ADDR + 0xE) << 2,
+	.private_value = (MASTERMIX_SCB_ADDR + 0xE) << 2,
 #endif
 },
 
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "ADC Volume",
-	info: snd_cs46xx_vol_info,
-	get: snd_cs46xx_vol_get,
-	put: snd_cs46xx_vol_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "ADC Volume",
+	.info = snd_cs46xx_vol_info,
+	.get = snd_cs46xx_vol_get,
+	.put = snd_cs46xx_vol_put,
 #ifndef CONFIG_SND_CS46XX_NEW_DSP
-	private_value: BA1_CVOL,
+	.private_value = BA1_CVOL,
 #else
-	private_value: (VARIDECIMATE_SCB_ADDR + 0xE) << 2,
+	.private_value = (VARIDECIMATE_SCB_ADDR + 0xE) << 2,
 #endif
 },
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "ADC Capture Switch",
-	info: snd_mixer_boolean_info,
-	get: snd_cs46xx_adc_capture_get,
-	put: snd_cs46xx_adc_capture_put
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "ADC Capture Switch",
+	.info = snd_mixer_boolean_info,
+	.get = snd_cs46xx_adc_capture_get,
+	.put = snd_cs46xx_adc_capture_put
 },
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "DAC Capture Switch",
-	info: snd_mixer_boolean_info,
-	get: snd_cs46xx_pcm_capture_get,
-	put: snd_cs46xx_pcm_capture_put
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "DAC Capture Switch",
+	.info = snd_mixer_boolean_info,
+	.get = snd_cs46xx_pcm_capture_get,
+	.put = snd_cs46xx_pcm_capture_put
 },
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "IEC 958 Output Switch",
-	info: snd_mixer_boolean_info,
-	get: snd_cs46xx_iec958_get,
-	put: snd_cs46xx_iec958_put,
-	private_value: CS46XX_MIXER_SPDIF_OUTPUT_ELEMENT,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "IEC 958 Output Switch",
+	.info = snd_mixer_boolean_info,
+	.get = snd_cs46xx_iec958_get,
+	.put = snd_cs46xx_iec958_put,
+	.private_value = CS46XX_MIXER_SPDIF_OUTPUT_ELEMENT,
 },
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "IEC 958 Input Switch",
-	info: snd_mixer_boolean_info,
-	get: snd_cs46xx_iec958_get,
-	put: snd_cs46xx_iec958_put,
-    private_value: CS46XX_MIXER_SPDIF_INPUT_ELEMENT,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "IEC 958 Input Switch",
+	.info = snd_mixer_boolean_info,
+	.get = snd_cs46xx_iec958_get,
+	.put = snd_cs46xx_iec958_put,
+    .private_value = CS46XX_MIXER_SPDIF_INPUT_ELEMENT,
 },
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "IEC 958 Input Volume",
-	info: snd_cs46xx_vol_info,
-	get: snd_cs46xx_vol_get,
-	put: snd_cs46xx_vol_put,
-	private_value: (ASYNCRX_SCB_ADDR + 0xE) << 2,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "IEC 958 Input Volume",
+	.info = snd_cs46xx_vol_info,
+	.get = snd_cs46xx_vol_get,
+	.put = snd_cs46xx_vol_put,
+	.private_value = (ASYNCRX_SCB_ADDR + 0xE) << 2,
 },
 #endif
 #ifdef CONFIG_SND_CS46XX_DEBUG_GPIO
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "EGPIO select",
-	info: snd_cs46xx_egpio_select_info,
-	get: snd_cs46xx_egpio_select_get,
-	put: snd_cs46xx_egpio_select_put,
-	private_value: 0,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "EGPIO select",
+	.info = snd_cs46xx_egpio_select_info,
+	.get = snd_cs46xx_egpio_select_get,
+	.put = snd_cs46xx_egpio_select_put,
+	.private_value = 0,
 },
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "EGPIO Input/Output",
-	info: snd_mixer_boolean_info,
-	get: snd_cs46xx_egpio_get,
-	put: snd_cs46xx_egpio_put,
-	private_value: BA0_EGPIODR,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "EGPIO Input/Output",
+	.info = snd_mixer_boolean_info,
+	.get = snd_cs46xx_egpio_get,
+	.put = snd_cs46xx_egpio_put,
+	.private_value = BA0_EGPIODR,
 },
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "EGPIO CMOS/Open drain",
-	info: snd_mixer_boolean_info,
-	get: snd_cs46xx_egpio_get,
-	put: snd_cs46xx_egpio_put,
-	private_value: BA0_EGPIOPTR,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "EGPIO CMOS/Open drain",
+	.info = snd_mixer_boolean_info,
+	.get = snd_cs46xx_egpio_get,
+	.put = snd_cs46xx_egpio_put,
+	.private_value = BA0_EGPIOPTR,
 },
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "EGPIO On/Off",
-	info: snd_mixer_boolean_info,
-	get: snd_cs46xx_egpio_get,
-	put: snd_cs46xx_egpio_put,
-	private_value: BA0_EGPIOSR,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "EGPIO On/Off",
+	.info = snd_mixer_boolean_info,
+	.get = snd_cs46xx_egpio_get,
+	.put = snd_cs46xx_egpio_put,
+	.private_value = BA0_EGPIOSR,
 },
 #endif
 };
@@ -1873,11 +1873,11 @@ static snd_kcontrol_new_t snd_cs46xx_controls[] __devinitdata = {
 /* Only available on the Hercules Game Theater XP soundcard */
 static snd_kcontrol_new_t snd_hercules_controls[] __devinitdata = {
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Optical/Coaxial SPDIF Input Switch",
-	info: snd_mixer_boolean_info,
-	get: snd_herc_spdif_select_get,
-	put: snd_herc_spdif_select_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Optical/Coaxial SPDIF Input Switch",
+	.info = snd_mixer_boolean_info,
+	.get = snd_herc_spdif_select_get,
+	.put = snd_herc_spdif_select_put,
 },
 };
 #endif
@@ -2125,16 +2125,16 @@ static void snd_cs46xx_midi_output_trigger(snd_rawmidi_substream_t * substream,
 
 static snd_rawmidi_ops_t snd_cs46xx_midi_output =
 {
-	.open           = snd_cs46xx_midi_output_open,
-	.close          = snd_cs46xx_midi_output_close,
-	.trigger        = snd_cs46xx_midi_output_trigger,
+	.open =		snd_cs46xx_midi_output_open,
+	.close =	snd_cs46xx_midi_output_close,
+	.trigger =	snd_cs46xx_midi_output_trigger,
 };
 
 static snd_rawmidi_ops_t snd_cs46xx_midi_input =
 {
-	.open           = snd_cs46xx_midi_input_open,
-	.close          = snd_cs46xx_midi_input_close,
-	.trigger        = snd_cs46xx_midi_input_trigger,
+	.open =		snd_cs46xx_midi_input_open,
+	.close =	snd_cs46xx_midi_input_close,
+	.trigger =	snd_cs46xx_midi_input_trigger,
 };
 
 int __devinit snd_cs46xx_midi(cs46xx_t *chip, int device, snd_rawmidi_t **rrawmidi)
@@ -3171,7 +3171,7 @@ int __devinit snd_cs46xx_create(snd_card_t * card,
 	struct cs_card_type *cp;
 	u16 ss_card, ss_vendor;
 	static snd_device_ops_t ops = {
-		.dev_free	= snd_cs46xx_dev_free,
+		.dev_free =	snd_cs46xx_dev_free,
 	};
 	
 	*rchip = NULL;
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 00a668764a46..e610d1cac2f5 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -199,10 +199,10 @@ static void __devexit snd_card_emu10k1_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "EMU10K1/Audigy",
-	id_table: snd_emu10k1_ids,
-	probe: snd_card_emu10k1_probe,
-	remove: __devexit_p(snd_card_emu10k1_remove),
+	.name = "EMU10K1/Audigy",
+	.id_table = snd_emu10k1_ids,
+	.probe = snd_card_emu10k1_probe,
+	.remove = __devexit_p(snd_card_emu10k1_remove),
 };
 
 static int __init alsa_card_emu10k1_init(void)
diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c
index ddafc47fd212..25a3f427b378 100644
--- a/sound/pci/emu10k1/emu10k1_callback.c
+++ b/sound/pci/emu10k1/emu10k1_callback.c
@@ -60,16 +60,16 @@ static void set_filterQ(emu10k1_t *hw, snd_emux_voice_t *vp);
  * set up operators
  */
 static snd_emux_operators_t emu10k1_ops = {
-	owner:		THIS_MODULE,
-	get_voice:	get_voice,
-	prepare:	start_voice,
-	trigger:	trigger_voice,
-	release:	release_voice,
-	update:		update_voice,
-	terminate:	terminate_voice,
-	free_voice:	free_voice,
-	sample_new:	snd_emu10k1_sample_new,
-	sample_free:	snd_emu10k1_sample_free,
+	.owner =	THIS_MODULE,
+	.get_voice =	get_voice,
+	.prepare =	start_voice,
+	.trigger =	trigger_voice,
+	.release =	release_voice,
+	.update =	update_voice,
+	.terminate =	terminate_voice,
+	.free_voice =	free_voice,
+	.sample_new =	snd_emu10k1_sample_new,
+	.sample_free =	snd_emu10k1_sample_free,
 };
 
 void
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index d0e9907b465f..1f7e862e3546 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -535,7 +535,7 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
 	int err;
 	int is_audigy;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_emu10k1_dev_free,
+		.dev_free =	snd_emu10k1_dev_free,
 	};
 	
 	*remu = NULL;
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index bd2f7e0acd1a..24f2c5ad1eac 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -739,15 +739,15 @@ static int snd_emu10k1_fx8010_playback_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_emu10k1_fx8010_playback_ops = {
-	open:			snd_emu10k1_fx8010_playback_open,
-	close:			snd_emu10k1_fx8010_playback_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_emu10k1_fx8010_playback_hw_params,
-	hw_free:		snd_emu10k1_fx8010_playback_hw_free,
-	prepare:		snd_emu10k1_fx8010_playback_prepare,
-	trigger:		snd_emu10k1_fx8010_playback_trigger,
-	copy:			snd_emu10k1_fx8010_playback_copy,
-	pointer:		snd_emu10k1_fx8010_playback_pointer,
+	.open =			snd_emu10k1_fx8010_playback_open,
+	.close =		snd_emu10k1_fx8010_playback_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_emu10k1_fx8010_playback_hw_params,
+	.hw_free =		snd_emu10k1_fx8010_playback_hw_free,
+	.prepare =		snd_emu10k1_fx8010_playback_prepare,
+	.trigger =		snd_emu10k1_fx8010_playback_trigger,
+	.copy =			snd_emu10k1_fx8010_playback_copy,
+	.pointer =		snd_emu10k1_fx8010_playback_pointer,
 };
 
 static void snd_emu10k1_fx8010_pcm_free(snd_pcm_t *pcm)
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index f46ab3500116..6881384c0c23 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -91,20 +91,20 @@ static int snd_emu10k1_spdif_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_emu10k1_spdif_mask_control =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-        iface:          SNDRV_CTL_ELEM_IFACE_MIXER,
-        name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
-        info:           snd_emu10k1_spdif_info,
-        get:            snd_emu10k1_spdif_get_mask
+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
+        .info =         snd_emu10k1_spdif_info,
+        .get =          snd_emu10k1_spdif_get_mask
 };
 
 static snd_kcontrol_new_t snd_emu10k1_spdif_control =
 {
-        iface:          SNDRV_CTL_ELEM_IFACE_MIXER,
-        name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-        info:           snd_emu10k1_spdif_info,
-        get:            snd_emu10k1_spdif_get,
-        put:            snd_emu10k1_spdif_put
+        .iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+        .info =         snd_emu10k1_spdif_info,
+        .get =          snd_emu10k1_spdif_get,
+        .put =          snd_emu10k1_spdif_put
 };
 
 
@@ -201,12 +201,12 @@ static int snd_emu10k1_send_routing_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_emu10k1_send_routing_control =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-        iface:          SNDRV_CTL_ELEM_IFACE_MIXER,
-        name:           "EMU10K1 PCM Send Routing",
-        info:           snd_emu10k1_send_routing_info,
-        get:            snd_emu10k1_send_routing_get,
-        put:            snd_emu10k1_send_routing_put
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "EMU10K1 PCM Send Routing",
+        .info =         snd_emu10k1_send_routing_info,
+        .get =          snd_emu10k1_send_routing_get,
+        .put =          snd_emu10k1_send_routing_put
 };
 
 static int snd_emu10k1_send_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -269,12 +269,12 @@ static int snd_emu10k1_send_volume_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_emu10k1_send_volume_control =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-        iface:          SNDRV_CTL_ELEM_IFACE_MIXER,
-        name:           "EMU10K1 PCM Send Volume",
-        info:           snd_emu10k1_send_volume_info,
-        get:            snd_emu10k1_send_volume_get,
-        put:            snd_emu10k1_send_volume_put
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "EMU10K1 PCM Send Volume",
+        .info =         snd_emu10k1_send_volume_info,
+        .get =          snd_emu10k1_send_volume_get,
+        .put =          snd_emu10k1_send_volume_put
 };
 
 static int snd_emu10k1_attn_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -331,12 +331,12 @@ static int snd_emu10k1_attn_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_emu10k1_attn_control =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-        iface:          SNDRV_CTL_ELEM_IFACE_MIXER,
-        name:           "EMU10K1 PCM Volume",
-        info:           snd_emu10k1_attn_info,
-        get:            snd_emu10k1_attn_get,
-        put:            snd_emu10k1_attn_put
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "EMU10K1 PCM Volume",
+        .info =         snd_emu10k1_attn_info,
+        .get =          snd_emu10k1_attn_get,
+        .put =          snd_emu10k1_attn_put
 };
 
 static int snd_emu10k1_shared_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -393,20 +393,20 @@ static int snd_emu10k1_shared_spdif_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_emu10k1_shared_spdif __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:		"SB Live Analog/Digital Output Jack",
-	info:		snd_emu10k1_shared_spdif_info,
-	get:		snd_emu10k1_shared_spdif_get,
-	put:		snd_emu10k1_shared_spdif_put
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =		"SB Live Analog/Digital Output Jack",
+	.info =		snd_emu10k1_shared_spdif_info,
+	.get =		snd_emu10k1_shared_spdif_get,
+	.put =		snd_emu10k1_shared_spdif_put
 };
 
 static snd_kcontrol_new_t snd_audigy_shared_spdif __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:		"Audigy Analog/Digital Output Jack",
-	info:		snd_emu10k1_shared_spdif_info,
-	get:		snd_emu10k1_shared_spdif_get,
-	put:		snd_emu10k1_shared_spdif_put
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =		"Audigy Analog/Digital Output Jack",
+	.info =		snd_emu10k1_shared_spdif_info,
+	.get =		snd_emu10k1_shared_spdif_get,
+	.put =		snd_emu10k1_shared_spdif_put
 };
 
 /*
diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c
index ef87f6487d55..5c4cfc829ce4 100644
--- a/sound/pci/emu10k1/emumpu401.c
+++ b/sound/pci/emu10k1/emumpu401.c
@@ -287,16 +287,16 @@ static void snd_emu10k1_midi_output_trigger(snd_rawmidi_substream_t * substream,
 
 static snd_rawmidi_ops_t snd_emu10k1_midi_output =
 {
-	open:		snd_emu10k1_midi_output_open,
-	close:		snd_emu10k1_midi_output_close,
-	trigger:	snd_emu10k1_midi_output_trigger,
+	.open =		snd_emu10k1_midi_output_open,
+	.close =	snd_emu10k1_midi_output_close,
+	.trigger =	snd_emu10k1_midi_output_trigger,
 };
 
 static snd_rawmidi_ops_t snd_emu10k1_midi_input =
 {
-	open:		snd_emu10k1_midi_input_open,
-	close:		snd_emu10k1_midi_input_close,
-	trigger:	snd_emu10k1_midi_input_trigger,
+	.open =		snd_emu10k1_midi_input_open,
+	.close =	snd_emu10k1_midi_input_close,
+	.trigger =	snd_emu10k1_midi_input_trigger,
 };
 
 static void snd_emu10k1_midi_free(snd_rawmidi_t *rmidi)
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index bd9dbc0c7c35..1885bebc908c 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -141,9 +141,9 @@ static unsigned int capture_period_sizes[31] = {
 };
 
 static snd_pcm_hw_constraint_list_t hw_constraints_capture_period_sizes = {
-	count: 31,
-	list: capture_period_sizes,
-	mask: 0
+	.count = 31,
+	.list = capture_period_sizes,
+	.mask = 0
 };
 
 static unsigned int capture_rates[8] = {
@@ -151,9 +151,9 @@ static unsigned int capture_rates[8] = {
 };
 
 static snd_pcm_hw_constraint_list_t hw_constraints_capture_rates = {
-	count: 8,
-	list: capture_rates,
-	mask: 0
+	.count = 8,
+	.list = capture_rates,
+	.mask = 0
 };
 
 static unsigned int snd_emu10k1_capture_rate_reg(unsigned int rate)
@@ -697,21 +697,21 @@ static snd_pcm_uframes_t snd_emu10k1_capture_pointer(snd_pcm_substream_t * subst
 
 static snd_pcm_hardware_t snd_emu10k1_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(128*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(128*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(128*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(128*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 /*
@@ -720,21 +720,21 @@ static snd_pcm_hardware_t snd_emu10k1_playback =
 
 static snd_pcm_hardware_t snd_emu10k1_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID),
-	formats:		SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_8000_48000,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(64*1024),
-	period_bytes_min:	384,
-	period_bytes_max:	(64*1024),
-	periods_min:		2,
-	periods_max:		2,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(64*1024),
+	.period_bytes_min =	384,
+	.period_bytes_max =	(64*1024),
+	.periods_min =		2,
+	.periods_max =		2,
+	.fifo_size =		0,
 };
 
 /*
@@ -945,28 +945,28 @@ static int snd_emu10k1_capture_efx_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_emu10k1_playback_ops = {
-	open:			snd_emu10k1_playback_open,
-	close:			snd_emu10k1_playback_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_emu10k1_playback_hw_params,
-	hw_free:		snd_emu10k1_playback_hw_free,
-	prepare:		snd_emu10k1_playback_prepare,
-	trigger:		snd_emu10k1_playback_trigger,
-	pointer:		snd_emu10k1_playback_pointer,
-	copy:			snd_pcm_sgbuf_ops_copy_playback,
-	silence:		snd_pcm_sgbuf_ops_silence,
-	page:			snd_pcm_sgbuf_ops_page,
+	.open =			snd_emu10k1_playback_open,
+	.close =		snd_emu10k1_playback_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_emu10k1_playback_hw_params,
+	.hw_free =		snd_emu10k1_playback_hw_free,
+	.prepare =		snd_emu10k1_playback_prepare,
+	.trigger =		snd_emu10k1_playback_trigger,
+	.pointer =		snd_emu10k1_playback_pointer,
+	.copy =			snd_pcm_sgbuf_ops_copy_playback,
+	.silence =		snd_pcm_sgbuf_ops_silence,
+	.page =			snd_pcm_sgbuf_ops_page,
 };
 
 static snd_pcm_ops_t snd_emu10k1_capture_ops = {
-	open:			snd_emu10k1_capture_open,
-	close:			snd_emu10k1_capture_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_emu10k1_capture_hw_params,
-	hw_free:		snd_emu10k1_capture_hw_free,
-	prepare:		snd_emu10k1_capture_prepare,
-	trigger:		snd_emu10k1_capture_trigger,
-	pointer:		snd_emu10k1_capture_pointer,
+	.open =			snd_emu10k1_capture_open,
+	.close =		snd_emu10k1_capture_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_emu10k1_capture_hw_params,
+	.hw_free =		snd_emu10k1_capture_hw_free,
+	.prepare =		snd_emu10k1_capture_prepare,
+	.trigger =		snd_emu10k1_capture_trigger,
+	.pointer =		snd_emu10k1_capture_pointer,
 };
 
 static void snd_emu10k1_pcm_free(snd_pcm_t *pcm)
@@ -1010,14 +1010,14 @@ int __devinit snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
 }
 
 static snd_pcm_ops_t snd_emu10k1_capture_mic_ops = {
-	open:			snd_emu10k1_capture_mic_open,
-	close:			snd_emu10k1_capture_mic_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_emu10k1_capture_hw_params,
-	hw_free:		snd_emu10k1_capture_hw_free,
-	prepare:		snd_emu10k1_capture_prepare,
-	trigger:		snd_emu10k1_capture_trigger,
-	pointer:		snd_emu10k1_capture_pointer,
+	.open =			snd_emu10k1_capture_mic_open,
+	.close =		snd_emu10k1_capture_mic_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_emu10k1_capture_hw_params,
+	.hw_free =		snd_emu10k1_capture_hw_free,
+	.prepare =		snd_emu10k1_capture_prepare,
+	.trigger =		snd_emu10k1_capture_trigger,
+	.pointer =		snd_emu10k1_capture_pointer,
 };
 
 static void snd_emu10k1_pcm_mic_free(snd_pcm_t *pcm)
@@ -1105,22 +1105,22 @@ static int snd_emu10k1_pcm_efx_voices_mask_put(snd_kcontrol_t * kcontrol, snd_ct
 }
 
 static snd_kcontrol_new_t snd_emu10k1_pcm_efx_voices_mask = {
-	iface: SNDRV_CTL_ELEM_IFACE_PCM,
-	name: "EFX voices mask",
-	info: snd_emu10k1_pcm_efx_voices_mask_info,
-	get: snd_emu10k1_pcm_efx_voices_mask_get,
-	put: snd_emu10k1_pcm_efx_voices_mask_put
+	.iface = SNDRV_CTL_ELEM_IFACE_PCM,
+	.name = "EFX voices mask",
+	.info = snd_emu10k1_pcm_efx_voices_mask_info,
+	.get = snd_emu10k1_pcm_efx_voices_mask_get,
+	.put = snd_emu10k1_pcm_efx_voices_mask_put
 };
 
 static snd_pcm_ops_t snd_emu10k1_capture_efx_ops = {
-	open:			snd_emu10k1_capture_efx_open,
-	close:			snd_emu10k1_capture_efx_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_emu10k1_capture_hw_params,
-	hw_free:		snd_emu10k1_capture_hw_free,
-	prepare:		snd_emu10k1_capture_prepare,
-	trigger:		snd_emu10k1_capture_trigger,
-	pointer:		snd_emu10k1_capture_pointer,
+	.open =			snd_emu10k1_capture_efx_open,
+	.close =		snd_emu10k1_capture_efx_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_emu10k1_capture_hw_params,
+	.hw_free =		snd_emu10k1_capture_hw_free,
+	.prepare =		snd_emu10k1_capture_prepare,
+	.trigger =		snd_emu10k1_capture_trigger,
+	.pointer =		snd_emu10k1_capture_pointer,
 };
 
 static void snd_emu10k1_pcm_efx_free(snd_pcm_t *pcm)
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 2aa66fc015f6..aba395239124 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -1752,26 +1752,26 @@ static int snd_es1968_capture_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_es1968_playback_ops = {
-	open:		snd_es1968_playback_open,
-	close:		snd_es1968_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_es1968_hw_params,
-	hw_free:	snd_es1968_hw_free,
-	prepare:	snd_es1968_pcm_prepare,
-	trigger:	snd_es1968_pcm_trigger,
-	pointer:	snd_es1968_pcm_pointer,
+	.open =		snd_es1968_playback_open,
+	.close =	snd_es1968_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_es1968_hw_params,
+	.hw_free =	snd_es1968_hw_free,
+	.prepare =	snd_es1968_pcm_prepare,
+	.trigger =	snd_es1968_pcm_trigger,
+	.pointer =	snd_es1968_pcm_pointer,
 };
 
 static snd_pcm_ops_t snd_es1968_capture_ops = {
-	open:		snd_es1968_capture_open,
-	close:		snd_es1968_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_es1968_hw_params,
-	hw_free:	snd_es1968_hw_free,
-	prepare:	snd_es1968_pcm_prepare,
-	trigger:	snd_es1968_pcm_trigger,
-	pointer:	snd_es1968_pcm_pointer,
-	copy:		snd_es1968_capture_copy,
+	.open =		snd_es1968_capture_open,
+	.close =	snd_es1968_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_es1968_hw_params,
+	.hw_free =	snd_es1968_hw_free,
+	.prepare =	snd_es1968_pcm_prepare,
+	.trigger =	snd_es1968_pcm_trigger,
+	.pointer =	snd_es1968_pcm_pointer,
+	.copy =		snd_es1968_capture_copy,
 };
 
 
@@ -2529,7 +2529,7 @@ static int __devinit snd_es1968_create(snd_card_t * card,
 				    es1968_t **chip_ret)
 {
 	static snd_device_ops_t ops = {
-		dev_free:       snd_es1968_dev_free,
+		.dev_free =	snd_es1968_dev_free,
 	};
 	es1968_t *chip;
 	int i, err;
@@ -2654,11 +2654,11 @@ static int snd_es1968_joystick_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
 
 static snd_kcontrol_new_t snd_es1968_control_switches[] __devinitdata = {
 	{
-		name: "Joystick",
-		iface: SNDRV_CTL_ELEM_IFACE_CARD,
-		info: snd_es1968_joystick_info,
-		get: snd_es1968_joystick_get,
-		put: snd_es1968_joystick_put,
+		.name = "Joystick",
+		.iface = SNDRV_CTL_ELEM_IFACE_CARD,
+		.info = snd_es1968_joystick_info,
+		.get = snd_es1968_joystick_get,
+		.put = snd_es1968_joystick_put,
 	}
 };
 
@@ -2761,13 +2761,13 @@ static void __devexit snd_es1968_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "ES1968 (ESS Maestro)",
-	id_table: snd_es1968_ids,
-	probe: snd_es1968_probe,
-	remove: __devexit_p(snd_es1968_remove),
+	.name = "ES1968 (ESS Maestro)",
+	.id_table = snd_es1968_ids,
+	.probe = snd_es1968_probe,
+	.remove = __devexit_p(snd_es1968_remove),
 #ifdef CONFIG_PM
-	suspend: snd_es1968_suspend,
-	resume: snd_es1968_resume,
+	.suspend = snd_es1968_suspend,
+	.resume = snd_es1968_resume,
 #endif
 };
 
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 7ad62afc5922..7cc0d63cae42 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -270,9 +270,9 @@ static unsigned int rates[] = {
 #define RATES sizeof(rates) / sizeof(rates[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_rates = {
-	count: RATES,
-	list: rates,
-	mask: 0,
+	.count = RATES,
+	.list = rates,
+	.mask = 0,
 };
 
 static unsigned int channels[] = {
@@ -282,9 +282,9 @@ static unsigned int channels[] = {
 #define CHANNELS sizeof(channels) / sizeof(channels[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_channels = {
-	count: CHANNELS,
-	list: channels,
-	mask: 0,
+	.count = CHANNELS,
+	.list = channels,
+	.mask = 0,
 };
 
 /*
@@ -512,7 +512,7 @@ static void snd_fm801_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static snd_pcm_hardware_t snd_fm801_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID),
 	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
@@ -531,7 +531,7 @@ static snd_pcm_hardware_t snd_fm801_playback =
 
 static snd_pcm_hardware_t snd_fm801_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID),
 	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
@@ -597,25 +597,25 @@ static int snd_fm801_capture_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_fm801_playback_ops = {
-	open:		snd_fm801_playback_open,
-	close:		snd_fm801_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_fm801_hw_params,
-	hw_free:	snd_fm801_hw_free,
-	prepare:	snd_fm801_playback_prepare,
-	trigger:	snd_fm801_playback_trigger,
-	pointer:	snd_fm801_playback_pointer,
+	.open =		snd_fm801_playback_open,
+	.close =	snd_fm801_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_fm801_hw_params,
+	.hw_free =	snd_fm801_hw_free,
+	.prepare =	snd_fm801_playback_prepare,
+	.trigger =	snd_fm801_playback_trigger,
+	.pointer =	snd_fm801_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_fm801_capture_ops = {
-	open:		snd_fm801_capture_open,
-	close:		snd_fm801_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_fm801_hw_params,
-	hw_free:	snd_fm801_hw_free,
-	prepare:	snd_fm801_capture_prepare,
-	trigger:	snd_fm801_capture_trigger,
-	pointer:	snd_fm801_capture_pointer,
+	.open =		snd_fm801_capture_open,
+	.close =	snd_fm801_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_fm801_hw_params,
+	.hw_free =	snd_fm801_hw_free,
+	.prepare =	snd_fm801_capture_prepare,
+	.trigger =	snd_fm801_capture_trigger,
+	.pointer =	snd_fm801_capture_pointer,
 };
 
 static void snd_fm801_pcm_free(snd_pcm_t *pcm)
@@ -656,9 +656,9 @@ static int __devinit snd_fm801_pcm(fm801_t *chip, int device, snd_pcm_t ** rpcm)
  */
 
 #define FM801_SINGLE(xname, reg, shift, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_fm801_info_single, \
-  get: snd_fm801_get_single, put: snd_fm801_put_single, \
-  private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_fm801_info_single, \
+  .get = snd_fm801_get_single, .put = snd_fm801_put_single, \
+  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
 static int snd_fm801_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -701,9 +701,9 @@ static int snd_fm801_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define FM801_DOUBLE(xname, reg, shift_left, shift_right, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_fm801_info_double, \
-  get: snd_fm801_get_double, put: snd_fm801_put_double, \
-  private_value: reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_fm801_info_double, \
+  .get = snd_fm801_get_double, .put = snd_fm801_put_double, \
+  .private_value = reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
 
 static int snd_fm801_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -804,11 +804,11 @@ FM801_SINGLE("I2S Playback Switch", FM801_I2S_VOL, 15, 1, 1),
 FM801_DOUBLE("FM Playback Volume", FM801_FM_VOL, 0, 8, 31, 1),
 FM801_SINGLE("FM Playback Switch", FM801_FM_VOL, 15, 1, 1),
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Digital Capture Source",
-	info: snd_fm801_info_mux,
-	get: snd_fm801_get_mux,
-	put: snd_fm801_put_mux,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Digital Capture Source",
+	.info = snd_fm801_info_mux,
+	.get = snd_fm801_get_mux,
+	.put = snd_fm801_put_mux,
 }
 };
 
@@ -903,7 +903,7 @@ static int __devinit snd_fm801_create(snd_card_t * card,
 	signed long timeout;
 	int err;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_fm801_dev_free,
+		.dev_free =	snd_fm801_dev_free,
 	};
 	
 	*rchip = NULL;
@@ -1091,10 +1091,10 @@ static void __devexit snd_card_fm801_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "FM801",
-	id_table: snd_fm801_ids,
-	probe: snd_card_fm801_probe,
-	remove: __devexit_p(snd_card_fm801_remove),
+	.name = "FM801",
+	.id_table = snd_fm801_ids,
+	.probe = snd_card_fm801_probe,
+	.remove = __devexit_p(snd_card_fm801_remove),
 };
                                                                 
 static int __init alsa_card_fm801_init(void)
diff --git a/sound/pci/ice1712.c b/sound/pci/ice1712.c
index b25f3dabcb40..9f324c563189 100644
--- a/sound/pci/ice1712.c
+++ b/sound/pci/ice1712.c
@@ -699,11 +699,11 @@ static int snd_ice1712_digmix_route_ac97_put(snd_kcontrol_t *kcontrol, snd_ctl_e
 }
 
 static snd_kcontrol_new_t snd_ice1712_mixer_digmix_route_ac97 __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Digital Mixer To AC97",
-	info: snd_ice1712_digmix_route_ac97_info,
-	get: snd_ice1712_digmix_route_ac97_get,
-	put: snd_ice1712_digmix_route_ac97_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Digital Mixer To AC97",
+	.info = snd_ice1712_digmix_route_ac97_info,
+	.get = snd_ice1712_digmix_route_ac97_get,
+	.put = snd_ice1712_digmix_route_ac97_put,
 };
 
 
@@ -865,9 +865,9 @@ static int ap_cs8427_probeaddr(snd_i2c_bus_t *bus, unsigned short addr)
 }
 
 static snd_i2c_ops_t ap_cs8427_i2c_ops = {
-	sendbytes: ap_cs8427_sendbytes,
-	readbytes: ap_cs8427_readbytes,
-	probeaddr: ap_cs8427_probeaddr,
+	.sendbytes = ap_cs8427_sendbytes,
+	.readbytes = ap_cs8427_readbytes,
+	.probeaddr = ap_cs8427_probeaddr,
 };
 
 /*
@@ -951,12 +951,12 @@ static void ewx_i2c_direction(snd_i2c_bus_t *bus, int clock, int data)
 }
 
 static snd_i2c_bit_ops_t snd_ice1712_ewx_cs8427_bit_ops = {
-	start: ewx_i2c_start,
-	stop: ewx_i2c_stop,
-	direction: ewx_i2c_direction,
-	setlines: ewx_i2c_setlines,
-	getclock: ewx_i2c_getclock,
-	getdata: ewx_i2c_getdata,
+	.start = ewx_i2c_start,
+	.stop = ewx_i2c_stop,
+	.direction = ewx_i2c_direction,
+	.setlines = ewx_i2c_setlines,
+	.getclock = ewx_i2c_getclock,
+	.getdata = ewx_i2c_getdata,
 };
 
 /* AK4524 chip select; address 0x48 bit 0-3 */
@@ -1538,61 +1538,61 @@ static snd_pcm_uframes_t snd_ice1712_capture_pointer(snd_pcm_substream_t * subst
 
 static snd_pcm_hardware_t snd_ice1712_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_PAUSE),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(64*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(64*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(64*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(64*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_ice1712_playback_ds =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_PAUSE),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(128*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(128*1024),
-	periods_min:		2,
-	periods_max:		2,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(128*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(128*1024),
+	.periods_min =		2,
+	.periods_max =		2,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_ice1712_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(64*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(64*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(64*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(64*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static int snd_ice1712_playback_open(snd_pcm_substream_t * substream)
@@ -1667,36 +1667,36 @@ static int snd_ice1712_capture_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_ice1712_playback_ops = {
-	open:		snd_ice1712_playback_open,
-	close:		snd_ice1712_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_ice1712_hw_params,
-	hw_free:	snd_ice1712_hw_free,
-	prepare:	snd_ice1712_playback_prepare,
-	trigger:	snd_ice1712_playback_trigger,
-	pointer:	snd_ice1712_playback_pointer,
+	.open =		snd_ice1712_playback_open,
+	.close =	snd_ice1712_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_ice1712_hw_params,
+	.hw_free =	snd_ice1712_hw_free,
+	.prepare =	snd_ice1712_playback_prepare,
+	.trigger =	snd_ice1712_playback_trigger,
+	.pointer =	snd_ice1712_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_ice1712_playback_ds_ops = {
-	open:		snd_ice1712_playback_ds_open,
-	close:		snd_ice1712_playback_ds_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_ice1712_hw_params,
-	hw_free:	snd_ice1712_hw_free,
-	prepare:	snd_ice1712_playback_ds_prepare,
-	trigger:	snd_ice1712_playback_ds_trigger,
-	pointer:	snd_ice1712_playback_ds_pointer,
+	.open =		snd_ice1712_playback_ds_open,
+	.close =	snd_ice1712_playback_ds_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_ice1712_hw_params,
+	.hw_free =	snd_ice1712_hw_free,
+	.prepare =	snd_ice1712_playback_ds_prepare,
+	.trigger =	snd_ice1712_playback_ds_trigger,
+	.pointer =	snd_ice1712_playback_ds_pointer,
 };
 
 static snd_pcm_ops_t snd_ice1712_capture_ops = {
-	open:		snd_ice1712_capture_open,
-	close:		snd_ice1712_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_ice1712_hw_params,
-	hw_free:	snd_ice1712_hw_free,
-	prepare:	snd_ice1712_capture_prepare,
-	trigger:	snd_ice1712_capture_trigger,
-	pointer:	snd_ice1712_capture_pointer,
+	.open =		snd_ice1712_capture_open,
+	.close =	snd_ice1712_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_ice1712_hw_params,
+	.hw_free =	snd_ice1712_hw_free,
+	.prepare =	snd_ice1712_capture_prepare,
+	.trigger =	snd_ice1712_capture_trigger,
+	.pointer =	snd_ice1712_capture_pointer,
 };
 
 static void snd_ice1712_pcm_free(snd_pcm_t *pcm)
@@ -1780,9 +1780,9 @@ static unsigned int rates[] = { 8000, 9600, 11025, 12000, 16000, 22050, 24000,
 #define RATES sizeof(rates) / sizeof(rates[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_rates = {
-	count: RATES,
-	list: rates,
-	mask: 0,
+	.count = RATES,
+	.list = rates,
+	.mask = 0,
 };
 
 #if 0
@@ -1980,42 +1980,42 @@ static snd_pcm_uframes_t snd_ice1712_capture_pro_pointer(snd_pcm_substream_t * s
 
 static snd_pcm_hardware_t snd_ice1712_playback_pro =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START),
-	formats:		SNDRV_PCM_FMTBIT_S32_LE,
-	rates:			SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000,
-	rate_min:		4000,
-	rate_max:		96000,
-	channels_min:		10,
-	channels_max:		10,
-	buffer_bytes_max:	(256*1024),
-	period_bytes_min:	10 * 4 * 2,
-	period_bytes_max:	131040,
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_S32_LE,
+	.rates =		SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000,
+	.rate_min =		4000,
+	.rate_max =		96000,
+	.channels_min =		10,
+	.channels_max =		10,
+	.buffer_bytes_max =	(256*1024),
+	.period_bytes_min =	10 * 4 * 2,
+	.period_bytes_max =	131040,
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_ice1712_capture_pro =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START),
-	formats:		SNDRV_PCM_FMTBIT_S32_LE,
-	rates:			SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000,
-	rate_min:		4000,
-	rate_max:		96000,
-	channels_min:		12,
-	channels_max:		12,
-	buffer_bytes_max:	(256*1024),
-	period_bytes_min:	12 * 4 * 2,
-	period_bytes_max:	131040,
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_S32_LE,
+	.rates =		SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000,
+	.rate_min =		4000,
+	.rate_max =		96000,
+	.channels_min =		12,
+	.channels_max =		12,
+	.buffer_bytes_max =	(256*1024),
+	.period_bytes_min =	12 * 4 * 2,
+	.period_bytes_max =	131040,
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static int snd_ice1712_playback_pro_open(snd_pcm_substream_t * substream)
@@ -2076,25 +2076,25 @@ static void snd_ice1712_pcm_profi_free(snd_pcm_t *pcm)
 }
 
 static snd_pcm_ops_t snd_ice1712_playback_pro_ops = {
-	open:		snd_ice1712_playback_pro_open,
-	close:		snd_ice1712_playback_pro_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_ice1712_hw_params,
-	hw_free:	snd_ice1712_hw_free,
-	prepare:	snd_ice1712_playback_pro_prepare,
-	trigger:	snd_ice1712_pro_trigger,
-	pointer:	snd_ice1712_playback_pro_pointer,
+	.open =		snd_ice1712_playback_pro_open,
+	.close =	snd_ice1712_playback_pro_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_ice1712_hw_params,
+	.hw_free =	snd_ice1712_hw_free,
+	.prepare =	snd_ice1712_playback_pro_prepare,
+	.trigger =	snd_ice1712_pro_trigger,
+	.pointer =	snd_ice1712_playback_pro_pointer,
 };
 
 static snd_pcm_ops_t snd_ice1712_capture_pro_ops = {
-	open:		snd_ice1712_capture_pro_open,
-	close:		snd_ice1712_capture_pro_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_ice1712_hw_params,
-	hw_free:	snd_ice1712_hw_free,
-	prepare:	snd_ice1712_capture_pro_prepare,
-	trigger:	snd_ice1712_pro_trigger,
-	pointer:	snd_ice1712_capture_pro_pointer,
+	.open =		snd_ice1712_capture_pro_open,
+	.close =	snd_ice1712_capture_pro_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_ice1712_hw_params,
+	.hw_free =	snd_ice1712_hw_free,
+	.prepare =	snd_ice1712_capture_pro_prepare,
+	.trigger =	snd_ice1712_pro_trigger,
+	.pointer =	snd_ice1712_capture_pro_pointer,
 };
 
 static int __devinit snd_ice1712_pcm_profi(ice1712_t * ice, int device, snd_pcm_t ** rpcm)
@@ -2531,11 +2531,11 @@ static int snd_ice1712_eeprom_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
 }
 
 static snd_kcontrol_new_t snd_ice1712_eeprom __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_CARD,
-	name: "ICE1712 EEPROM",
-	access: SNDRV_CTL_ELEM_ACCESS_READ,
-	info: snd_ice1712_eeprom_info,
-	get: snd_ice1712_eeprom_get
+	.iface = SNDRV_CTL_ELEM_IFACE_CARD,
+	.name = "ICE1712 EEPROM",
+	.access = SNDRV_CTL_ELEM_ACCESS_READ,
+	.info = snd_ice1712_eeprom_info,
+	.get = snd_ice1712_eeprom_get
 };
 
 /*
@@ -2610,11 +2610,11 @@ static int snd_ice1712_spdif_default_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_ice1712_spdif_default __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-	info:		snd_ice1712_spdif_default_info,
-	get:		snd_ice1712_spdif_default_get,
-	put:		snd_ice1712_spdif_default_put
+	.iface =		SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =           SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+	.info =		snd_ice1712_spdif_default_info,
+	.get =		snd_ice1712_spdif_default_get,
+	.put =		snd_ice1712_spdif_default_put
 };
 
 static int snd_ice1712_spdif_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -2686,20 +2686,20 @@ static int snd_ice1712_spdif_maskp_get(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_ice1712_spdif_maskc __devinitdata =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
-	info:		snd_ice1712_spdif_mask_info,
-	get:		snd_ice1712_spdif_maskc_get,
+	.access =		SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =		SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =           SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+	.info =		snd_ice1712_spdif_mask_info,
+	.get =		snd_ice1712_spdif_maskc_get,
 };
 
 static snd_kcontrol_new_t snd_ice1712_spdif_maskp __devinitdata =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
-	info:		snd_ice1712_spdif_mask_info,
-	get:		snd_ice1712_spdif_maskp_get,
+	.access =		SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =		SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =           SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
+	.info =		snd_ice1712_spdif_mask_info,
+	.get =		snd_ice1712_spdif_maskp_get,
 };
 
 static int snd_ice1712_spdif_stream_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -2772,18 +2772,18 @@ static int snd_ice1712_spdif_stream_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_ice1712_spdif_stream __devinitdata =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
-	info:		snd_ice1712_spdif_stream_info,
-	get:		snd_ice1712_spdif_stream_get,
-	put:		snd_ice1712_spdif_stream_put
+	.access =		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.iface =		SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =           SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
+	.info =		snd_ice1712_spdif_stream_info,
+	.get =		snd_ice1712_spdif_stream_get,
+	.put =		snd_ice1712_spdif_stream_put
 };
 
 #define ICE1712_GPIO(xiface, xname, xindex, mask, invert, xaccess) \
-{ iface: xiface, name: xname, access: xaccess, info: snd_ice1712_gpio_info, \
-  get: snd_ice1712_gpio_get, put: snd_ice1712_gpio_put, \
-  private_value: mask | (invert << 24) }
+{ .iface = xiface, .name = xname, .access = xaccess, .info = snd_ice1712_gpio_info, \
+  .get = snd_ice1712_gpio_get, .put = snd_ice1712_gpio_put, \
+  .private_value = mask | (invert << 24) }
 
 static int snd_ice1712_gpio_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -2877,11 +2877,11 @@ static int snd_ice1712_pro_spdif_master_put(snd_kcontrol_t * kcontrol, snd_ctl_e
 }
 
 static snd_kcontrol_new_t snd_ice1712_pro_spdif_master __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Multi Track IEC958 Master",
-	info: snd_ice1712_pro_spdif_master_info,
-	get: snd_ice1712_pro_spdif_master_get,
-	put: snd_ice1712_pro_spdif_master_put
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Multi Track IEC958 Master",
+	.info = snd_ice1712_pro_spdif_master_info,
+	.get = snd_ice1712_pro_spdif_master_get,
+	.put = snd_ice1712_pro_spdif_master_put
 };
 
 /*
@@ -3028,19 +3028,19 @@ static int snd_ice1712_pro_route_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_el
 }
 
 static snd_kcontrol_new_t snd_ice1712_mixer_pro_analog_route __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "H/W Playback Route",
-	info: snd_ice1712_pro_route_info,
-	get: snd_ice1712_pro_route_analog_get,
-	put: snd_ice1712_pro_route_analog_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "H/W Playback Route",
+	.info = snd_ice1712_pro_route_info,
+	.get = snd_ice1712_pro_route_analog_get,
+	.put = snd_ice1712_pro_route_analog_put,
 };
 
 static snd_kcontrol_new_t snd_ice1712_mixer_pro_spdif_route __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "IEC958 Playback Route",
-	info: snd_ice1712_pro_route_info,
-	get: snd_ice1712_pro_route_spdif_get,
-	put: snd_ice1712_pro_route_spdif_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "IEC958 Playback Route",
+	.info = snd_ice1712_pro_route_info,
+	.get = snd_ice1712_pro_route_spdif_get,
+	.put = snd_ice1712_pro_route_spdif_put,
 };
 
 
@@ -3078,11 +3078,11 @@ static int snd_ice1712_pro_volume_rate_put(snd_kcontrol_t * kcontrol, snd_ctl_el
 }
 
 static snd_kcontrol_new_t snd_ice1712_mixer_pro_volume_rate __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Multi Track Volume Rate",
-	info: snd_ice1712_pro_volume_rate_info,
-	get: snd_ice1712_pro_volume_rate_get,
-	put: snd_ice1712_pro_volume_rate_put
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Multi Track Volume Rate",
+	.info = snd_ice1712_pro_volume_rate_info,
+	.get = snd_ice1712_pro_volume_rate_get,
+	.put = snd_ice1712_pro_volume_rate_put
 };
 
 static int snd_ice1712_pro_peak_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -3110,11 +3110,11 @@ static int snd_ice1712_pro_peak_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_valu
 }
 
 static snd_kcontrol_new_t snd_ice1712_mixer_pro_peak __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Multi Track Peak",
-	access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	info: snd_ice1712_pro_peak_info,
-	get: snd_ice1712_pro_peak_get
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Multi Track Peak",
+	.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+	.info = snd_ice1712_pro_peak_info,
+	.get = snd_ice1712_pro_peak_get
 };
 
 /*
@@ -3166,21 +3166,21 @@ static int snd_ice1712_ewx_io_sense_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_
 }
 
 static snd_kcontrol_new_t snd_ice1712_ewx_input_sense __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Input Sensitivity Switch",
-	info: snd_ice1712_ewx_io_sense_info,
-	get: snd_ice1712_ewx_io_sense_get,
-	put: snd_ice1712_ewx_io_sense_put,
-	private_value: ICE1712_EWX2496_AIN_SEL,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Input Sensitivity Switch",
+	.info = snd_ice1712_ewx_io_sense_info,
+	.get = snd_ice1712_ewx_io_sense_get,
+	.put = snd_ice1712_ewx_io_sense_put,
+	.private_value = ICE1712_EWX2496_AIN_SEL,
 };
 
 static snd_kcontrol_new_t snd_ice1712_ewx_output_sense __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Output Sensitivity Switch",
-	info: snd_ice1712_ewx_io_sense_info,
-	get: snd_ice1712_ewx_io_sense_get,
-	put: snd_ice1712_ewx_io_sense_put,
-	private_value: ICE1712_EWX2496_AOUT_SEL,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Output Sensitivity Switch",
+	.info = snd_ice1712_ewx_io_sense_info,
+	.get = snd_ice1712_ewx_io_sense_get,
+	.put = snd_ice1712_ewx_io_sense_put,
+	.private_value = ICE1712_EWX2496_AOUT_SEL,
 };
 
 
@@ -3264,19 +3264,19 @@ static int snd_ice1712_ews88mt_input_sense_put(snd_kcontrol_t *kcontrol, snd_ctl
 }
 
 static snd_kcontrol_new_t snd_ice1712_ews88mt_input_sense __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Input Sensitivity Switch",
-	info: snd_ice1712_ewx_io_sense_info,
-	get: snd_ice1712_ews88mt_input_sense_get,
-	put: snd_ice1712_ews88mt_input_sense_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Input Sensitivity Switch",
+	.info = snd_ice1712_ewx_io_sense_info,
+	.get = snd_ice1712_ews88mt_input_sense_get,
+	.put = snd_ice1712_ews88mt_input_sense_put,
 };
 
 static snd_kcontrol_new_t snd_ice1712_ews88mt_output_sense __devinitdata = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "Output Sensitivity Switch",
-	info: snd_ice1712_ewx_io_sense_info,
-	get: snd_ice1712_ews88mt_output_sense_get,
-	put: snd_ice1712_ews88mt_output_sense_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "Output Sensitivity Switch",
+	.info = snd_ice1712_ewx_io_sense_info,
+	.get = snd_ice1712_ews88mt_output_sense_get,
+	.put = snd_ice1712_ews88mt_output_sense_put,
 };
 
 
@@ -3344,13 +3344,13 @@ static int snd_ice1712_ews88d_control_put(snd_kcontrol_t * kcontrol, snd_ctl_ele
 }
 
 #define EWS88D_CONTROL(xiface, xname, xshift, xinvert, xaccess) \
-{ iface: xiface,\
-  name: xname,\
-  access: xaccess,\
-  info: snd_ice1712_ews88d_control_info,\
-  get: snd_ice1712_ews88d_control_get,\
-  put: snd_ice1712_ews88d_control_put,\
-  private_value: xshift | (xinvert << 8),\
+{ .iface = xiface,\
+  .name = xname,\
+  .access = xaccess,\
+  .info = snd_ice1712_ews88d_control_info,\
+  .get = snd_ice1712_ews88d_control_get,\
+  .put = snd_ice1712_ews88d_control_put,\
+  .private_value = xshift | (xinvert << 8),\
 }
 
 static snd_kcontrol_new_t snd_ice1712_ews88d_controls[] __devinitdata = {
@@ -3442,13 +3442,13 @@ static int snd_ice1712_6fire_control_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_
 }
 
 #define DMX6FIRE_CONTROL(xiface, xname, xshift, xinvert, xaccess) \
-{ iface: xiface,\
-  name: xname,\
-  access: xaccess,\
-  info: snd_ice1712_6fire_control_info,\
-  get: snd_ice1712_6fire_control_get,\
-  put: snd_ice1712_6fire_control_put,\
-  private_value: xshift | (xinvert << 8),\
+{ .iface = xiface,\
+  .name = xname,\
+  .access = xaccess,\
+  .info = snd_ice1712_6fire_control_info,\
+  .get = snd_ice1712_6fire_control_get,\
+  .put = snd_ice1712_6fire_control_put,\
+  .private_value = xshift | (xinvert << 8),\
 }
 
 static snd_kcontrol_new_t snd_ice1712_6fire_led __devinitdata =
@@ -4123,7 +4123,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card,
 	ice1712_t *ice;
 	int err;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_ice1712_dev_free,
+		.dev_free =	snd_ice1712_dev_free,
 	};
 
 	*r_ice1712 = NULL;
@@ -4339,10 +4339,10 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "ICE1712",
-	id_table: snd_ice1712_ids,
-	probe: snd_ice1712_probe,
-	remove: __devexit_p(snd_ice1712_remove),
+	.name = "ICE1712",
+	.id_table = snd_ice1712_ids,
+	.probe = snd_ice1712_probe,
+	.remove = __devexit_p(snd_ice1712_remove),
 };
 
 static int __init alsa_card_ice1712_init(void)
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 07d054fa4e10..22b900534615 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -617,43 +617,43 @@ static snd_pcm_uframes_t snd_intel8x0_capture_pointer(snd_pcm_substream_t * subs
 
 static snd_pcm_hardware_t snd_intel8x0_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_PAUSE |
 				 SNDRV_PCM_INFO_RESUME),
-	formats:		SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			0,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		2,
-	channels_max:		2,
-	buffer_bytes_max:	128 * 1024,
-	period_bytes_min:	32,
-	period_bytes_max:	128 * 1024,
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		0,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		2,
+	.channels_max =		2,
+	.buffer_bytes_max =	128 * 1024,
+	.period_bytes_min =	32,
+	.period_bytes_max =	128 * 1024,
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_intel8x0_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_RESUME),
-	formats:		SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			0,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		2,
-	channels_max:		2,
-	buffer_bytes_max:	128 * 1024,
-	period_bytes_min:	32,
-	period_bytes_max:	128 * 1024,
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		0,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		2,
+	.channels_max =		2,
+	.buffer_bytes_max =	128 * 1024,
+	.period_bytes_min =	32,
+	.period_bytes_max =	128 * 1024,
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static unsigned int channels4[] = {
@@ -663,9 +663,9 @@ static unsigned int channels4[] = {
 #define CHANNELS4 sizeof(channels4) / sizeof(channels4[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_channels4 = {
-	count: CHANNELS4,
-	list: channels4,
-	mask: 0,
+	.count = CHANNELS4,
+	.list = channels4,
+	.mask = 0,
 };
 
 static unsigned int channels6[] = {
@@ -675,9 +675,9 @@ static unsigned int channels6[] = {
 #define CHANNELS6 sizeof(channels6) / sizeof(channels6[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_channels6 = {
-	count: CHANNELS6,
-	list: channels6,
-	mask: 0,
+	.count = CHANNELS6,
+	.list = channels6,
+	.mask = 0,
 };
 
 static int snd_intel8x0_playback_open(snd_pcm_substream_t * substream)
@@ -748,25 +748,25 @@ static int snd_intel8x0_capture_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_intel8x0_playback_ops = {
-	open:		snd_intel8x0_playback_open,
-	close:		snd_intel8x0_playback_close,
-	ioctl:		snd_intel8x0_playback_ioctl,
-	hw_params:	snd_intel8x0_hw_params,
-	hw_free:	snd_intel8x0_hw_free,
-	prepare:	snd_intel8x0_playback_prepare,
-	trigger:	snd_intel8x0_playback_trigger,
-	pointer:	snd_intel8x0_playback_pointer,
+	.open =		snd_intel8x0_playback_open,
+	.close =	snd_intel8x0_playback_close,
+	.ioctl =	snd_intel8x0_playback_ioctl,
+	.hw_params =	snd_intel8x0_hw_params,
+	.hw_free =	snd_intel8x0_hw_free,
+	.prepare =	snd_intel8x0_playback_prepare,
+	.trigger =	snd_intel8x0_playback_trigger,
+	.pointer =	snd_intel8x0_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_intel8x0_capture_ops = {
-	open:		snd_intel8x0_capture_open,
-	close:		snd_intel8x0_capture_close,
-	ioctl:		snd_intel8x0_capture_ioctl,
-	hw_params:	snd_intel8x0_hw_params,
-	hw_free:	snd_intel8x0_hw_free,
-	prepare:	snd_intel8x0_capture_prepare,
-	trigger:	snd_intel8x0_capture_trigger,
-	pointer:	snd_intel8x0_capture_pointer,
+	.open =		snd_intel8x0_capture_open,
+	.close =	snd_intel8x0_capture_close,
+	.ioctl =	snd_intel8x0_capture_ioctl,
+	.hw_params =	snd_intel8x0_hw_params,
+	.hw_free =	snd_intel8x0_hw_free,
+	.prepare =	snd_intel8x0_capture_prepare,
+	.trigger =	snd_intel8x0_capture_trigger,
+	.pointer =	snd_intel8x0_capture_pointer,
 };
 
 static void snd_intel8x0_pcm_free(snd_pcm_t *pcm)
@@ -855,22 +855,22 @@ static snd_pcm_uframes_t snd_intel8x0_capture_mic_pointer(snd_pcm_substream_t *
 
 static snd_pcm_hardware_t snd_intel8x0_capture_mic =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_PAUSE),
-	formats:		SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			0,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		1,
-	buffer_bytes_max:	128 * 1024,
-	period_bytes_min:	32,
-	period_bytes_max:	128 * 1024,
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		0,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		1,
+	.buffer_bytes_max =	128 * 1024,
+	.period_bytes_min =	32,
+	.period_bytes_max =	128 * 1024,
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static int snd_intel8x0_capture_mic_open(snd_pcm_substream_t * substream)
@@ -901,14 +901,14 @@ static int snd_intel8x0_capture_mic_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_intel8x0_capture_mic_ops = {
-	open:		snd_intel8x0_capture_mic_open,
-	close:		snd_intel8x0_capture_mic_close,
-	ioctl:		snd_intel8x0_capture_mic_ioctl,
-	hw_params:	snd_intel8x0_hw_params,
-	hw_free:	snd_intel8x0_hw_free,
-	prepare:	snd_intel8x0_capture_mic_prepare,
-	trigger:	snd_intel8x0_capture_mic_trigger,
-	pointer:	snd_intel8x0_capture_mic_pointer,
+	.open =		snd_intel8x0_capture_mic_open,
+	.close =	snd_intel8x0_capture_mic_close,
+	.ioctl =	snd_intel8x0_capture_mic_ioctl,
+	.hw_params =	snd_intel8x0_hw_params,
+	.hw_free =	snd_intel8x0_hw_free,
+	.prepare =	snd_intel8x0_capture_mic_prepare,
+	.trigger =	snd_intel8x0_capture_mic_trigger,
+	.pointer =	snd_intel8x0_capture_mic_pointer,
 };
 
 static void snd_intel8x0_pcm_mic_free(snd_pcm_t *pcm)
@@ -1308,7 +1308,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card,
 	intel8x0_t *chip;
 	int err;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_intel8x0_dev_free,
+		.dev_free =	snd_intel8x0_dev_free,
 	};
 
 	*r_intel8x0 = NULL;
@@ -1510,7 +1510,7 @@ static void __devexit snd_intel8x0_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "Intel ICH",
+	.name = "Intel ICH",
 	id_table: snd_intel8x0_ids,
 	probe: snd_intel8x0_probe,
 	remove: __devexit_p(snd_intel8x0_remove),
@@ -1572,9 +1572,9 @@ static struct pci_device_id snd_intel8x0_joystick_ids[] __devinitdata = {
 };
 
 static struct pci_driver joystick_driver = {
-	name: "Intel ICH Joystick",
-	id_table: snd_intel8x0_joystick_ids,
-	probe: snd_intel8x0_joystick_probe,
+	.name = "Intel ICH Joystick",
+	.id_table = snd_intel8x0_joystick_ids,
+	.probe = snd_intel8x0_joystick_probe,
 };
 #endif
 
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 3ecf120648c7..27e0ec1c4e40 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -1162,42 +1162,42 @@ static int snd_korg1212_downloadDSPCode(korg1212_t *korg1212)
 
 static snd_pcm_hardware_t snd_korg1212_playback_info =
 {
-        info:                (SNDRV_PCM_INFO_MMAP |
+	.info =               (SNDRV_PCM_INFO_MMAP |
                               SNDRV_PCM_INFO_MMAP_VALID |
                               SNDRV_PCM_INFO_INTERLEAVED),
-        formats:             SNDRV_PCM_FMTBIT_S16_LE,
-        rates:               (SNDRV_PCM_RATE_44100 |
+	.formats =	      SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =              (SNDRV_PCM_RATE_44100 |
                               SNDRV_PCM_RATE_48000),
-        rate_min:            44100,
-        rate_max:            48000,
-        channels_min:        K1212_CHANNELS,
-        channels_max:        K1212_CHANNELS,
-        buffer_bytes_max:    K1212_BUF_SIZE,
-        period_bytes_min:    K1212_PERIOD_BYTES,
-        period_bytes_max:    K1212_PERIOD_BYTES,
-        periods_min:         K1212_PERIODS,
-        periods_max:         K1212_PERIODS,
-        fifo_size:           0,
+        .rate_min =           44100,
+        .rate_max =           48000,
+        .channels_min =       K1212_CHANNELS,
+        .channels_max =       K1212_CHANNELS,
+        .buffer_bytes_max =   K1212_BUF_SIZE,
+        .period_bytes_min =   K1212_PERIOD_BYTES,
+        .period_bytes_max =   K1212_PERIOD_BYTES,
+        .periods_min =        K1212_PERIODS,
+        .periods_max =        K1212_PERIODS,
+        .fifo_size =          0,
 };
 
 static snd_pcm_hardware_t snd_korg1212_capture_info =
 {
-        info:                (SNDRV_PCM_INFO_MMAP |
+        .info =               (SNDRV_PCM_INFO_MMAP |
                               SNDRV_PCM_INFO_MMAP_VALID |
                               SNDRV_PCM_INFO_INTERLEAVED),
-        formats:             SNDRV_PCM_FMTBIT_S16_LE,
-        rates:               (SNDRV_PCM_RATE_44100 |
+        .formats =	      SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =	      (SNDRV_PCM_RATE_44100 |
                               SNDRV_PCM_RATE_48000),
-        rate_min:            44100,
-        rate_max:            48000,
-        channels_min:        K1212_CHANNELS,
-        channels_max:        K1212_CHANNELS,
-        buffer_bytes_max:    K1212_BUF_SIZE,
-        period_bytes_min:    K1212_PERIOD_BYTES,
-        period_bytes_max:    K1212_PERIOD_BYTES,
-        periods_min:         K1212_PERIODS,
-        periods_max:         K1212_PERIODS,
-        fifo_size:           0,
+        .rate_min =           44100,
+        .rate_max =           48000,
+        .channels_min =       K1212_CHANNELS,
+        .channels_max =       K1212_CHANNELS,
+        .buffer_bytes_max =   K1212_BUF_SIZE,
+        .period_bytes_min =   K1212_PERIOD_BYTES,
+        .period_bytes_max =   K1212_PERIOD_BYTES,
+        .periods_min =        K1212_PERIODS,
+        .periods_max =        K1212_PERIODS,
+        .fifo_size =          0,
 };
 
 static void snd_korg1212_free_pcm(snd_pcm_t *pcm)
@@ -1216,9 +1216,9 @@ static unsigned int period_bytes[] = { K1212_PERIOD_BYTES };
 #define PERIOD_BYTES sizeof(period_bytes) / sizeof(period_bytes[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_period_bytes = {
-        count: PERIOD_BYTES,
-        list: period_bytes,
-        mask: 0
+        .count = PERIOD_BYTES,
+        .list = period_bytes,
+        .mask = 0
 };
 
 static int snd_korg1212_playback_open(snd_pcm_substream_t *substream)
@@ -1504,26 +1504,26 @@ static int snd_korg1212_playback_silence(snd_pcm_substream_t *substream,
 }
 
 static snd_pcm_ops_t snd_korg1212_playback_ops = {
-        open:           snd_korg1212_playback_open,
-        close:          snd_korg1212_playback_close,
-        ioctl:          snd_korg1212_ioctl,
-        hw_params:      snd_korg1212_hw_params,
-        prepare:        snd_korg1212_prepare,
-        trigger:        snd_korg1212_trigger,
-        pointer:        snd_korg1212_pointer,
-        copy:           snd_korg1212_playback_copy,
-        silence:        snd_korg1212_playback_silence,
+        .open =		snd_korg1212_playback_open,
+        .close =	snd_korg1212_playback_close,
+        .ioctl =	snd_korg1212_ioctl,
+        .hw_params =	snd_korg1212_hw_params,
+        .prepare =	snd_korg1212_prepare,
+        .trigger =	snd_korg1212_trigger,
+        .pointer =	snd_korg1212_pointer,
+        .copy =		snd_korg1212_playback_copy,
+        .silence =	snd_korg1212_playback_silence,
 };
 
 static snd_pcm_ops_t snd_korg1212_capture_ops = {
-	open:		snd_korg1212_capture_open,
-	close:		snd_korg1212_capture_close,
-	ioctl:		snd_korg1212_ioctl,
-	hw_params:	snd_korg1212_hw_params,
-	prepare:	snd_korg1212_prepare,
-	trigger:	snd_korg1212_trigger,
-	pointer:	snd_korg1212_pointer,
-	copy:		snd_korg1212_capture_copy,
+	.open =		snd_korg1212_capture_open,
+	.close =	snd_korg1212_capture_close,
+	.ioctl =	snd_korg1212_ioctl,
+	.hw_params =	snd_korg1212_hw_params,
+	.prepare =	snd_korg1212_prepare,
+	.trigger =	snd_korg1212_trigger,
+	.pointer =	snd_korg1212_pointer,
+	.copy =		snd_korg1212_capture_copy,
 };
 
 /*
@@ -1803,31 +1803,31 @@ static int snd_korg1212_control_sync_put(snd_kcontrol_t * kcontrol, snd_ctl_elem
 
 #define MON_MIXER(ord,c_name)									\
         {											\
-                access:		SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,	\
-                iface:          SNDRV_CTL_ELEM_IFACE_MIXER,					\
-                name:		c_name " Monitor Volume",						\
-                info:		snd_korg1212_control_volume_info,				\
-                get:		snd_korg1212_control_volume_get,				\
-                put:		snd_korg1212_control_volume_put,				\
-		private_value:	ord,								\
+                .access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,	\
+                .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,					\
+                .name =		c_name " Monitor Volume",					\
+                .info =		snd_korg1212_control_volume_info,				\
+                .get =		snd_korg1212_control_volume_get,				\
+                .put =		snd_korg1212_control_volume_put,				\
+		.private_value = ord,								\
         },                                                                                      \
         {											\
-                access:		SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,	\
-                iface:          SNDRV_CTL_ELEM_IFACE_MIXER,					\
-                name:		c_name " Monitor Route",						\
-                info:		snd_korg1212_control_route_info,				\
-                get:		snd_korg1212_control_route_get,					\
-                put:		snd_korg1212_control_route_put,					\
-		private_value:	ord,								\
+                .access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,	\
+                .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,					\
+                .name =		c_name " Monitor Route",					\
+                .info =		snd_korg1212_control_route_info,				\
+                .get =		snd_korg1212_control_route_get,					\
+                .put =		snd_korg1212_control_route_put,					\
+		.private_value = ord,								\
         },                                                                                      \
         {											\
-                access:		SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,	\
-                iface:          SNDRV_CTL_ELEM_IFACE_PCM,					\
-                name:		c_name " Monitor Phase Invert",						\
-                info:		snd_korg1212_control_phase_info,				\
-                get:		snd_korg1212_control_phase_get,					\
-                put:		snd_korg1212_control_phase_put,					\
-		private_value:	ord,								\
+                .access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,	\
+                .iface =        SNDRV_CTL_ELEM_IFACE_PCM,					\
+                .name =		c_name " Monitor Phase Invert",					\
+                .info =		snd_korg1212_control_phase_info,				\
+                .get =		snd_korg1212_control_phase_get,					\
+                .put =		snd_korg1212_control_phase_put,					\
+		.private_value = ord,								\
         }
 
 static snd_kcontrol_new_t snd_korg1212_controls[] = {
@@ -1836,20 +1836,20 @@ static snd_kcontrol_new_t snd_korg1212_controls[] = {
         MON_MIXER(0, "ADAT-1"), MON_MIXER(1, "ADAT-2"), MON_MIXER(2, "ADAT-3"), MON_MIXER(3, "ADAT-4"),
         MON_MIXER(4, "ADAT-5"), MON_MIXER(5, "ADAT-6"), MON_MIXER(6, "ADAT-7"), MON_MIXER(7, "ADAT-8"),
 	{
-                access:		SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,
-                iface:          SNDRV_CTL_ELEM_IFACE_PCM,
-                name:		"Sync Source",
-                info:		snd_korg1212_control_sync_info,
-                get:		snd_korg1212_control_sync_get,
-                put:		snd_korg1212_control_sync_put,
+                .access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,
+                .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+                .name =		"Sync Source",
+                .info =		snd_korg1212_control_sync_info,
+                .get =		snd_korg1212_control_sync_get,
+                .put =		snd_korg1212_control_sync_put,
         },
         {
-                access:		SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,
-                iface:          SNDRV_CTL_ELEM_IFACE_MIXER,
-                name:		"ADC Attenuation",
-                info:		snd_korg1212_control_analog_info,
-                get:		snd_korg1212_control_analog_get,
-                put:		snd_korg1212_control_analog_put,
+                .access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,
+                .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name =		"ADC Attenuation",
+                .info =		snd_korg1212_control_analog_info,
+                .get =		snd_korg1212_control_analog_get,
+                .put =		snd_korg1212_control_analog_put,
         }
 };
 
@@ -2305,10 +2305,10 @@ static void __devexit snd_korg1212_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "korg1212",
-	id_table: snd_korg1212_ids,
-	probe: snd_korg1212_probe,
-	remove: __devexit_p(snd_korg1212_remove),
+	.name = "korg1212",
+	.id_table = snd_korg1212_ids,
+	.probe = snd_korg1212_probe,
+	.remove = __devexit_p(snd_korg1212_remove),
 };
 
 static int __init alsa_card_korg1212_init(void)
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 21f209de4303..85208bd0c7cc 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -1736,25 +1736,25 @@ snd_m3_capture_close(snd_pcm_substream_t *subs)
  */
 
 static snd_pcm_ops_t snd_m3_playback_ops = {
-	open:		snd_m3_playback_open,
-	close:		snd_m3_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_m3_pcm_hw_params,
-	hw_free:	snd_m3_pcm_hw_free,
-	prepare:	snd_m3_pcm_prepare,
-	trigger:	snd_m3_pcm_trigger,
-	pointer:	snd_m3_pcm_pointer,
+	.open =		snd_m3_playback_open,
+	.close =	snd_m3_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_m3_pcm_hw_params,
+	.hw_free =	snd_m3_pcm_hw_free,
+	.prepare =	snd_m3_pcm_prepare,
+	.trigger =	snd_m3_pcm_trigger,
+	.pointer =	snd_m3_pcm_pointer,
 };
 
 static snd_pcm_ops_t snd_m3_capture_ops = {
-	open:		snd_m3_capture_open,
-	close:		snd_m3_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_m3_pcm_hw_params,
-	hw_free:	snd_m3_pcm_hw_free,
-	prepare:	snd_m3_pcm_prepare,
-	trigger:	snd_m3_pcm_trigger,
-	pointer:	snd_m3_pcm_pointer,
+	.open =		snd_m3_capture_open,
+	.close =	snd_m3_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_m3_pcm_hw_params,
+	.hw_free =	snd_m3_pcm_hw_free,
+	.prepare =	snd_m3_pcm_prepare,
+	.trigger =	snd_m3_pcm_trigger,
+	.pointer =	snd_m3_pcm_pointer,
 };
 
 static int __devinit
@@ -2503,7 +2503,7 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci,
 	struct m3_quirk *quirk;
 	u16 subsystem_vendor, subsystem_device;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_m3_dev_free,
+		.dev_free =	snd_m3_dev_free,
 	};
 
 	*chip_ret = NULL;
@@ -2706,13 +2706,13 @@ static void __devexit snd_m3_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "Maestro3",
-	id_table: snd_m3_ids,
-	probe: snd_m3_probe,
-	remove: __devexit_p(snd_m3_remove),
+	.name = "Maestro3",
+	.id_table = snd_m3_ids,
+	.probe = snd_m3_probe,
+	.remove = __devexit_p(snd_m3_remove),
 #ifdef CONFIG_PM
-	suspend: snd_m3_suspend,
-	resume: snd_m3_resume,
+	.suspend = snd_m3_suspend,
+	.resume = snd_m3_resume,
 #endif
 };
 	
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index a1c4ea24c18d..13802f7fa552 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -410,9 +410,9 @@ static int samplerates[8] = {
 };
 #define NUM_SAMPLERATES (sizeof(samplerates) / sizeof(samplerates[0]))
 static snd_pcm_hw_constraint_list_t constraints_rates = {
-	count: NUM_SAMPLERATES, 
-	list: samplerates,
-	mask: 0,
+	.count = NUM_SAMPLERATES, 
+	.list = samplerates,
+	.mask = 0,
 };
 
 /*
@@ -866,29 +866,29 @@ snd_nm256_capture_close(snd_pcm_substream_t *substream)
  * create a pcm instance
  */
 static snd_pcm_ops_t snd_nm256_playback_ops = {
-	open:		snd_nm256_playback_open,
-	close:		snd_nm256_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_nm256_pcm_hw_params,
-	prepare:	snd_nm256_pcm_prepare,
-	trigger:	snd_nm256_playback_trigger,
-	pointer:	snd_nm256_playback_pointer,
+	.open =		snd_nm256_playback_open,
+	.close =	snd_nm256_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_nm256_pcm_hw_params,
+	.prepare =	snd_nm256_pcm_prepare,
+	.trigger =	snd_nm256_playback_trigger,
+	.pointer =	snd_nm256_playback_pointer,
 #ifndef __i386__
-	copy:		snd_nm256_playback_copy,
-	silence:	snd_nm256_playback_silence,
+	.copy =		snd_nm256_playback_copy,
+	.silence =	snd_nm256_playback_silence,
 #endif
 };
 
 static snd_pcm_ops_t snd_nm256_capture_ops = {
-	open:		snd_nm256_capture_open,
-	close:		snd_nm256_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_nm256_pcm_hw_params,
-	prepare:	snd_nm256_pcm_prepare,
-	trigger:	snd_nm256_capture_trigger,
-	pointer:	snd_nm256_capture_pointer,
+	.open =		snd_nm256_capture_open,
+	.close =	snd_nm256_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_nm256_pcm_hw_params,
+	.prepare =	snd_nm256_pcm_prepare,
+	.trigger =	snd_nm256_capture_trigger,
+	.pointer =	snd_nm256_capture_pointer,
 #ifndef __i386__
-	copy:		snd_nm256_capture_copy,
+	.copy =		snd_nm256_capture_copy,
 #endif
 };
 
@@ -1395,7 +1395,7 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
 	nm256_t *chip;
 	int err, pval;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_nm256_dev_free,
+		.dev_free =	snd_nm256_dev_free,
 	};
 	u32 addr;
 
@@ -1646,13 +1646,13 @@ static void __devexit snd_nm256_remove(struct pci_dev *pci)
 
 
 static struct pci_driver driver = {
-	name: "NeoMagic 256",
-	id_table: snd_nm256_ids,
-	probe: snd_nm256_probe,
-	remove: __devexit_p(snd_nm256_remove),
+	.name = "NeoMagic 256",
+	.id_table = snd_nm256_ids,
+	.probe = snd_nm256_probe,
+	.remove = __devexit_p(snd_nm256_remove),
 #ifdef CONFIG_PM
-	suspend: snd_nm256_suspend,
-	resume: snd_nm256_resume,
+	.suspend = snd_nm256_suspend,
+	.resume = snd_nm256_resume,
 #endif
 };
 
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index b863c89f200e..7b2d860a992b 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -284,7 +284,7 @@ static int snd_rme32_capture_copy(snd_pcm_substream_t * substream, int channel,
  * Digital output capabilites (S/PDIF)
  */
 static snd_pcm_hardware_t snd_rme32_playback_spdif_info = {
-	info:		(SNDRV_PCM_INFO_MMAP |
+	.info =		(SNDRV_PCM_INFO_MMAP |
 			 SNDRV_PCM_INFO_MMAP_VALID |
 			 SNDRV_PCM_INFO_INTERLEAVED | 
 			 SNDRV_PCM_INFO_PAUSE),
@@ -309,7 +309,7 @@ static snd_pcm_hardware_t snd_rme32_playback_spdif_info = {
  * Digital input capabilites (S/PDIF)
  */
 static snd_pcm_hardware_t snd_rme32_capture_spdif_info = {
-	info:		(SNDRV_PCM_INFO_MMAP |
+	.info =		(SNDRV_PCM_INFO_MMAP |
 			 SNDRV_PCM_INFO_MMAP_VALID |
 			 SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE),
 	formats:	(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE),
@@ -332,7 +332,7 @@ static snd_pcm_hardware_t snd_rme32_capture_spdif_info = {
  */
 static snd_pcm_hardware_t snd_rme32_playback_adat_info =
 {
-	info:		     (SNDRV_PCM_INFO_MMAP |
+	.info =		     (SNDRV_PCM_INFO_MMAP |
 			      SNDRV_PCM_INFO_MMAP_VALID |
 			      SNDRV_PCM_INFO_INTERLEAVED |
 			      SNDRV_PCM_INFO_PAUSE),
@@ -356,7 +356,7 @@ static snd_pcm_hardware_t snd_rme32_playback_adat_info =
  */
 static snd_pcm_hardware_t snd_rme32_capture_adat_info =
 {
-	info:		     (SNDRV_PCM_INFO_MMAP |
+	.info =		     (SNDRV_PCM_INFO_MMAP |
 			      SNDRV_PCM_INFO_MMAP_VALID |
 			      SNDRV_PCM_INFO_INTERLEAVED |
 			      SNDRV_PCM_INFO_PAUSE),
@@ -793,9 +793,9 @@ static unsigned int period_bytes[] = { RME32_BLOCK_SIZE };
 #define PERIOD_BYTES sizeof(period_bytes) / sizeof(period_bytes[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_period_bytes = {
-	count:PERIOD_BYTES,
-	list:period_bytes,
-	mask:0
+	.count = PERIOD_BYTES,
+	.list = period_bytes,
+	.mask = 0
 };
 
 static int snd_rme32_playback_spdif_open(snd_pcm_substream_t * substream)
@@ -1142,53 +1142,53 @@ snd_rme32_capture_pointer(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_rme32_playback_spdif_ops = {
-	open:		snd_rme32_playback_spdif_open,
-	close:		snd_rme32_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_rme32_playback_hw_params,
-	hw_free:	snd_rme32_playback_hw_free,
-	prepare:	snd_rme32_playback_prepare,
-	trigger:	snd_rme32_playback_trigger,
-	pointer:	snd_rme32_playback_pointer,
-	copy:		snd_rme32_playback_copy,
-	silence:	snd_rme32_playback_silence,
+	.open =		snd_rme32_playback_spdif_open,
+	.close =	snd_rme32_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_rme32_playback_hw_params,
+	.hw_free =	snd_rme32_playback_hw_free,
+	.prepare =	snd_rme32_playback_prepare,
+	.trigger =	snd_rme32_playback_trigger,
+	.pointer =	snd_rme32_playback_pointer,
+	.copy =		snd_rme32_playback_copy,
+	.silence =	snd_rme32_playback_silence,
 };
 
 static snd_pcm_ops_t snd_rme32_capture_spdif_ops = {
-	open:		snd_rme32_capture_spdif_open,
-	close:		snd_rme32_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_rme32_capture_hw_params,
-	hw_free:	snd_rme32_capture_hw_free,
-	prepare:	snd_rme32_capture_prepare,
-	trigger:	snd_rme32_capture_trigger,
-	pointer:	snd_rme32_capture_pointer,
-	copy:		snd_rme32_capture_copy,
+	.open =		snd_rme32_capture_spdif_open,
+	.close =	snd_rme32_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_rme32_capture_hw_params,
+	.hw_free =	snd_rme32_capture_hw_free,
+	.prepare =	snd_rme32_capture_prepare,
+	.trigger =	snd_rme32_capture_trigger,
+	.pointer =	snd_rme32_capture_pointer,
+	.copy =		snd_rme32_capture_copy,
 };
 
 static snd_pcm_ops_t snd_rme32_playback_adat_ops = {
-	open:		snd_rme32_playback_adat_open,
-	close:		snd_rme32_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_rme32_playback_hw_params,
-	hw_free:	snd_rme32_playback_hw_free,
-	prepare:	snd_rme32_playback_prepare,
-	trigger:	snd_rme32_playback_trigger,
-	pointer:	snd_rme32_playback_pointer,
-	copy:		snd_rme32_playback_copy,
-	silence:	snd_rme32_playback_silence,
+	.open =		snd_rme32_playback_adat_open,
+	.close =	snd_rme32_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_rme32_playback_hw_params,
+	.hw_free =	snd_rme32_playback_hw_free,
+	.prepare =	snd_rme32_playback_prepare,
+	.trigger =	snd_rme32_playback_trigger,
+	.pointer =	snd_rme32_playback_pointer,
+	.copy =		snd_rme32_playback_copy,
+	.silence =	snd_rme32_playback_silence,
 };
 
 static snd_pcm_ops_t snd_rme32_capture_adat_ops = {
-	open:		snd_rme32_capture_adat_open,
-	close:		snd_rme32_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_rme32_capture_hw_params,
-	hw_free:	snd_rme32_capture_hw_free,
-	prepare:	snd_rme32_capture_prepare,
-	trigger:	snd_rme32_capture_trigger,
-	pointer:	snd_rme32_capture_pointer,
-	copy:		snd_rme32_capture_copy,
+	.open =		snd_rme32_capture_adat_open,
+	.close =	snd_rme32_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_rme32_capture_hw_params,
+	.hw_free =	snd_rme32_capture_hw_free,
+	.prepare =	snd_rme32_capture_prepare,
+	.trigger =	snd_rme32_capture_trigger,
+	.pointer =	snd_rme32_capture_pointer,
+	.copy =		snd_rme32_capture_copy,
 };
 
 static void snd_rme32_free(void *private_data)
@@ -1760,56 +1760,56 @@ static int snd_rme32_control_spdif_mask_get(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_rme32_controls[] = {
 	{
-		iface:	SNDRV_CTL_ELEM_IFACE_PCM,
-		name:	SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
-		info:	snd_rme32_control_spdif_info,
-		get:	snd_rme32_control_spdif_get,
-		put:	snd_rme32_control_spdif_put
+		.iface = SNDRV_CTL_ELEM_IFACE_PCM,
+		.name =	SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
+		.info =	snd_rme32_control_spdif_info,
+		.get =	snd_rme32_control_spdif_get,
+		.put =	snd_rme32_control_spdif_put
 	},
 	{
-		access:	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-		iface:	SNDRV_CTL_ELEM_IFACE_PCM,
-		name:	SNDRV_CTL_NAME_IEC958("", PLAYBACK, PCM_STREAM),
-		info:	snd_rme32_control_spdif_stream_info,
-		get:	snd_rme32_control_spdif_stream_get,
-		put:	snd_rme32_control_spdif_stream_put
+		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+		.iface = SNDRV_CTL_ELEM_IFACE_PCM,
+		.name =	SNDRV_CTL_NAME_IEC958("", PLAYBACK, PCM_STREAM),
+		.info =	snd_rme32_control_spdif_stream_info,
+		.get =	snd_rme32_control_spdif_stream_get,
+		.put =	snd_rme32_control_spdif_stream_put
 	},
 	{
-		access:	SNDRV_CTL_ELEM_ACCESS_READ,
-		iface:	SNDRV_CTL_ELEM_IFACE_MIXER,
-		name:	SNDRV_CTL_NAME_IEC958("", PLAYBACK, CON_MASK),
-		info:	snd_rme32_control_spdif_mask_info,
-		get:	snd_rme32_control_spdif_mask_get,
-		private_value:	IEC958_AES0_PROFESSIONAL | IEC958_AES0_CON_EMPHASIS
+		.access = SNDRV_CTL_ELEM_ACCESS_READ,
+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+		.name =	SNDRV_CTL_NAME_IEC958("", PLAYBACK, CON_MASK),
+		.info =	snd_rme32_control_spdif_mask_info,
+		.get =	snd_rme32_control_spdif_mask_get,
+		.private_value = IEC958_AES0_PROFESSIONAL | IEC958_AES0_CON_EMPHASIS
 	},
 	{
-		access:	SNDRV_CTL_ELEM_ACCESS_READ,
-		iface:	SNDRV_CTL_ELEM_IFACE_MIXER,
-		name:	SNDRV_CTL_NAME_IEC958("", PLAYBACK, PRO_MASK),
-		info:	snd_rme32_control_spdif_mask_info,
-		get:	snd_rme32_control_spdif_mask_get,
-		private_value:	IEC958_AES0_PROFESSIONAL | IEC958_AES0_PRO_EMPHASIS
+		.access = SNDRV_CTL_ELEM_ACCESS_READ,
+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+		.name =	SNDRV_CTL_NAME_IEC958("", PLAYBACK, PRO_MASK),
+		.info =	snd_rme32_control_spdif_mask_info,
+		.get =	snd_rme32_control_spdif_mask_get,
+		.private_value = IEC958_AES0_PROFESSIONAL | IEC958_AES0_PRO_EMPHASIS
 	},
 	{
-		iface:	SNDRV_CTL_ELEM_IFACE_PCM,
-		name:	"Input Connector",
-		info:	snd_rme32_info_inputtype_control,
-		get:	snd_rme32_get_inputtype_control,
-		put:	snd_rme32_put_inputtype_control
+		.iface = SNDRV_CTL_ELEM_IFACE_PCM,
+		.name =	"Input Connector",
+		.info =	snd_rme32_info_inputtype_control,
+		.get =	snd_rme32_get_inputtype_control,
+		.put =	snd_rme32_put_inputtype_control
 	},
 	{
-		iface:	SNDRV_CTL_ELEM_IFACE_PCM,
-		name:	"Loopback Input",
-		info:	snd_rme32_info_loopback_control,
-		get:	snd_rme32_get_loopback_control,
-		put:	snd_rme32_put_loopback_control
+		.iface = SNDRV_CTL_ELEM_IFACE_PCM,
+		.name =	"Loopback Input",
+		.info =	snd_rme32_info_loopback_control,
+		.get =	snd_rme32_get_loopback_control,
+		.put =	snd_rme32_put_loopback_control
 	},
 	{
-		iface:	SNDRV_CTL_ELEM_IFACE_PCM,
-		name:	"Clock Mode",
-		info:	snd_rme32_info_clockmode_control,
-		get:	snd_rme32_get_clockmode_control,
-		put:	snd_rme32_put_clockmode_control
+		.iface = SNDRV_CTL_ELEM_IFACE_PCM,
+		.name =	"Clock Mode",
+		.info =	snd_rme32_info_clockmode_control,
+		.get =	snd_rme32_get_clockmode_control,
+		.put =	snd_rme32_put_clockmode_control
 	}
 };
 
@@ -1898,10 +1898,10 @@ static void __devexit snd_rme32_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name:		"RME Digi32",
-	id_table:	snd_rme32_ids,
-	probe:		snd_rme32_probe,
-	remove:		__devexit_p(snd_rme32_remove),
+	.name =		"RME Digi32",
+	.id_table =	snd_rme32_ids,
+	.probe =	snd_rme32_probe,
+	.remove =	__devexit_p(snd_rme32_remove),
 };
 
 static int __init alsa_card_rme32_init(void)
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 68391b7b017c..d27a9615a453 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -375,28 +375,28 @@ snd_rme96_capture_copy(snd_pcm_substream_t *substream,
  */
 static snd_pcm_hardware_t snd_rme96_playback_spdif_info =
 {
-	info:		     (SNDRV_PCM_INFO_MMAP |
+	.info =		     (SNDRV_PCM_INFO_MMAP |
 			      SNDRV_PCM_INFO_MMAP_VALID |
 			      SNDRV_PCM_INFO_INTERLEAVED |
 			      SNDRV_PCM_INFO_PAUSE),
-	formats:	     (SNDRV_PCM_FMTBIT_S16_LE |
+	.formats =	     (SNDRV_PCM_FMTBIT_S16_LE |
 			      SNDRV_PCM_FMTBIT_S32_LE),
-	rates:		     (SNDRV_PCM_RATE_32000 |
+	.rates =	     (SNDRV_PCM_RATE_32000 |
 			      SNDRV_PCM_RATE_44100 | 
 			      SNDRV_PCM_RATE_48000 | 
 			      SNDRV_PCM_RATE_64000 |
 			      SNDRV_PCM_RATE_88200 | 
 			      SNDRV_PCM_RATE_96000),
-	rate_min:	     32000,
-	rate_max:	     96000,
-	channels_min:	     2,
-	channels_max:	     2,
-	buffer_bytes_max:   RME96_BUFFER_SIZE,
-	period_bytes_min:   RME96_SMALL_BLOCK_SIZE,
-	period_bytes_max:   RME96_LARGE_BLOCK_SIZE,
-	periods_min:	     RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE,
-	periods_max:	     RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE,
-	fifo_size:	     0,
+	.rate_min =	     32000,
+	.rate_max =	     96000,
+	.channels_min =	     2,
+	.channels_max =	     2,
+	.buffer_bytes_max =  RME96_BUFFER_SIZE,
+	.period_bytes_min =  RME96_SMALL_BLOCK_SIZE,
+	.period_bytes_max =  RME96_LARGE_BLOCK_SIZE,
+	.periods_min =	     RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE,
+	.periods_max =	     RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE,
+	.fifo_size =	     0,
 };
 
 /*
@@ -404,28 +404,28 @@ static snd_pcm_hardware_t snd_rme96_playback_spdif_info =
  */
 static snd_pcm_hardware_t snd_rme96_capture_spdif_info =
 {
-	info:		     (SNDRV_PCM_INFO_MMAP |
+	.info =		     (SNDRV_PCM_INFO_MMAP |
 			      SNDRV_PCM_INFO_MMAP_VALID |
 			      SNDRV_PCM_INFO_INTERLEAVED |
 			      SNDRV_PCM_INFO_PAUSE),
-	formats:	     (SNDRV_PCM_FMTBIT_S16_LE |
+	.formats =	     (SNDRV_PCM_FMTBIT_S16_LE |
 			      SNDRV_PCM_FMTBIT_S32_LE),
-	rates:		     (SNDRV_PCM_RATE_32000 |
+	.rates =	     (SNDRV_PCM_RATE_32000 |
 			      SNDRV_PCM_RATE_44100 | 
 			      SNDRV_PCM_RATE_48000 | 
 			      SNDRV_PCM_RATE_64000 |
 			      SNDRV_PCM_RATE_88200 | 
 			      SNDRV_PCM_RATE_96000),
-	rate_min:	     32000,
-	rate_max:	     96000,
-	channels_min:	     2,
-	channels_max:	     2,
-	buffer_bytes_max:   RME96_BUFFER_SIZE,
-	period_bytes_min:   RME96_SMALL_BLOCK_SIZE,
-	period_bytes_max:   RME96_LARGE_BLOCK_SIZE,
-	periods_min:	     RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE,
-	periods_max:	     RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE,
-	fifo_size:	     0,
+	.rate_min =	     32000,
+	.rate_max =	     96000,
+	.channels_min =	     2,
+	.channels_max =	     2,
+	.buffer_bytes_max =  RME96_BUFFER_SIZE,
+	.period_bytes_min =  RME96_SMALL_BLOCK_SIZE,
+	.period_bytes_max =  RME96_LARGE_BLOCK_SIZE,
+	.periods_min =	     RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE,
+	.periods_max =	     RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE,
+	.fifo_size =	     0,
 };
 
 /*
@@ -433,24 +433,24 @@ static snd_pcm_hardware_t snd_rme96_capture_spdif_info =
  */
 static snd_pcm_hardware_t snd_rme96_playback_adat_info =
 {
-	info:		     (SNDRV_PCM_INFO_MMAP |
+	.info =		     (SNDRV_PCM_INFO_MMAP |
 			      SNDRV_PCM_INFO_MMAP_VALID |
 			      SNDRV_PCM_INFO_INTERLEAVED |
 			      SNDRV_PCM_INFO_PAUSE),
-	formats:	     (SNDRV_PCM_FMTBIT_S16_LE |
+	.formats =	     (SNDRV_PCM_FMTBIT_S16_LE |
 			      SNDRV_PCM_FMTBIT_S32_LE),
-	rates:	             (SNDRV_PCM_RATE_44100 | 
+	.rates =             (SNDRV_PCM_RATE_44100 | 
 			      SNDRV_PCM_RATE_48000),
-	rate_min:            44100,
-	rate_max:            48000,
-	channels_min:        8,
-	channels_max:	     8,
-	buffer_bytes_max:   RME96_BUFFER_SIZE,
-	period_bytes_min:   RME96_SMALL_BLOCK_SIZE,
-	period_bytes_max:   RME96_LARGE_BLOCK_SIZE,
-	periods_min:	     RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE,
-	periods_max:	     RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE,
-	fifo_size:	     0,
+	.rate_min =          44100,
+	.rate_max =          48000,
+	.channels_min =      8,
+	.channels_max =	     8,
+	.buffer_bytes_max =  RME96_BUFFER_SIZE,
+	.period_bytes_min =  RME96_SMALL_BLOCK_SIZE,
+	.period_bytes_max =  RME96_LARGE_BLOCK_SIZE,
+	.periods_min =	     RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE,
+	.periods_max =	     RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE,
+	.fifo_size =	     0,
 };
 
 /*
@@ -458,24 +458,24 @@ static snd_pcm_hardware_t snd_rme96_playback_adat_info =
  */
 static snd_pcm_hardware_t snd_rme96_capture_adat_info =
 {
-	info:		     (SNDRV_PCM_INFO_MMAP |
+	.info =		     (SNDRV_PCM_INFO_MMAP |
 			      SNDRV_PCM_INFO_MMAP_VALID |
 			      SNDRV_PCM_INFO_INTERLEAVED |
 			      SNDRV_PCM_INFO_PAUSE),
-	formats:	     (SNDRV_PCM_FMTBIT_S16_LE |
+	.formats =	     (SNDRV_PCM_FMTBIT_S16_LE |
 			      SNDRV_PCM_FMTBIT_S32_LE),
-	rates:	             (SNDRV_PCM_RATE_44100 | 
+	.rates =	     (SNDRV_PCM_RATE_44100 | 
 			      SNDRV_PCM_RATE_48000),
-	rate_min:            44100,
-	rate_max:            48000,
-	channels_min:        8,
-	channels_max:	     8,
-	buffer_bytes_max:   RME96_BUFFER_SIZE,
-	period_bytes_min:   RME96_SMALL_BLOCK_SIZE,
-	period_bytes_max:   RME96_LARGE_BLOCK_SIZE,
-	periods_min:	     RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE,
-	periods_max:	     RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE,
-	fifo_size:           0,
+	.rate_min =          44100,
+	.rate_max =          48000,
+	.channels_min =      8,
+	.channels_max =	     8,
+	.buffer_bytes_max =  RME96_BUFFER_SIZE,
+	.period_bytes_min =  RME96_SMALL_BLOCK_SIZE,
+	.period_bytes_max =  RME96_LARGE_BLOCK_SIZE,
+	.periods_min =	     RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE,
+	.periods_max =	     RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE,
+	.fifo_size =         0,
 };
 
 /*
@@ -1150,9 +1150,9 @@ static unsigned int period_bytes[] = { RME96_SMALL_BLOCK_SIZE, RME96_LARGE_BLOCK
 #define PERIOD_BYTES sizeof(period_bytes) / sizeof(period_bytes[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_period_bytes = {
-	count: PERIOD_BYTES,
-	list: period_bytes,
-	mask: 0
+	.count = PERIOD_BYTES,
+	.list = period_bytes,
+	.mask = 0
 };
 
 static int
@@ -1493,53 +1493,53 @@ snd_rme96_capture_pointer(snd_pcm_substream_t *substream)
 }
 
 static snd_pcm_ops_t snd_rme96_playback_spdif_ops = {
-	open:		snd_rme96_playback_spdif_open,
-	close:		snd_rme96_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_rme96_playback_hw_params,
-	hw_free:	snd_rme96_playback_hw_free,
-	prepare:	snd_rme96_playback_prepare,
-	trigger:	snd_rme96_playback_trigger,
-	pointer:	snd_rme96_playback_pointer,
-	copy:		snd_rme96_playback_copy,
-	silence:	snd_rme96_playback_silence,
+	.open =		snd_rme96_playback_spdif_open,
+	.close =	snd_rme96_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_rme96_playback_hw_params,
+	.hw_free =	snd_rme96_playback_hw_free,
+	.prepare =	snd_rme96_playback_prepare,
+	.trigger =	snd_rme96_playback_trigger,
+	.pointer =	snd_rme96_playback_pointer,
+	.copy =		snd_rme96_playback_copy,
+	.silence =	snd_rme96_playback_silence,
 };
 
 static snd_pcm_ops_t snd_rme96_capture_spdif_ops = {
-	open:		snd_rme96_capture_spdif_open,
-	close:		snd_rme96_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_rme96_capture_hw_params,
-	hw_free:	snd_rme96_capture_hw_free,
-	prepare:	snd_rme96_capture_prepare,
-	trigger:	snd_rme96_capture_trigger,
-	pointer:	snd_rme96_capture_pointer,
-	copy:		snd_rme96_capture_copy,
+	.open =		snd_rme96_capture_spdif_open,
+	.close =	snd_rme96_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_rme96_capture_hw_params,
+	.hw_free =	snd_rme96_capture_hw_free,
+	.prepare =	snd_rme96_capture_prepare,
+	.trigger =	snd_rme96_capture_trigger,
+	.pointer =	snd_rme96_capture_pointer,
+	.copy =		snd_rme96_capture_copy,
 };
 
 static snd_pcm_ops_t snd_rme96_playback_adat_ops = {
-	open:		snd_rme96_playback_adat_open,
-	close:		snd_rme96_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_rme96_playback_hw_params,
-	hw_free:	snd_rme96_playback_hw_free,
-	prepare:	snd_rme96_playback_prepare,
-	trigger:	snd_rme96_playback_trigger,
-	pointer:	snd_rme96_playback_pointer,
-	copy:		snd_rme96_playback_copy,
-	silence:	snd_rme96_playback_silence,
+	.open =		snd_rme96_playback_adat_open,
+	.close =	snd_rme96_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_rme96_playback_hw_params,
+	.hw_free =	snd_rme96_playback_hw_free,
+	.prepare =	snd_rme96_playback_prepare,
+	.trigger =	snd_rme96_playback_trigger,
+	.pointer =	snd_rme96_playback_pointer,
+	.copy =		snd_rme96_playback_copy,
+	.silence =	snd_rme96_playback_silence,
 };
 
 static snd_pcm_ops_t snd_rme96_capture_adat_ops = {
-	open:		snd_rme96_capture_adat_open,
-	close:		snd_rme96_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_rme96_capture_hw_params,
-	hw_free:	snd_rme96_capture_hw_free,
-	prepare:	snd_rme96_capture_prepare,
-	trigger:	snd_rme96_capture_trigger,
-	pointer:	snd_rme96_capture_pointer,
-	copy:		snd_rme96_capture_copy,
+	.open =		snd_rme96_capture_adat_open,
+	.close =	snd_rme96_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_rme96_capture_hw_params,
+	.hw_free =	snd_rme96_capture_hw_free,
+	.prepare =	snd_rme96_capture_prepare,
+	.trigger =	snd_rme96_capture_trigger,
+	.pointer =	snd_rme96_capture_pointer,
+	.copy =		snd_rme96_capture_copy,
 };
 
 static void
@@ -2299,81 +2299,81 @@ snd_rme96_dac_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u)
 
 static snd_kcontrol_new_t snd_rme96_controls[] = {
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-	info:		snd_rme96_control_spdif_info,
-	get:		snd_rme96_control_spdif_get,
-	put:		snd_rme96_control_spdif_put
+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+	.info =		snd_rme96_control_spdif_info,
+	.get =		snd_rme96_control_spdif_get,
+	.put =		snd_rme96_control_spdif_put
 },
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
-	info:		snd_rme96_control_spdif_stream_info,
-	get:		snd_rme96_control_spdif_stream_get,
-	put:		snd_rme96_control_spdif_stream_put
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
+	.info =		snd_rme96_control_spdif_stream_info,
+	.get =		snd_rme96_control_spdif_stream_get,
+	.put =		snd_rme96_control_spdif_stream_put
 },
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
-	info:		snd_rme96_control_spdif_mask_info,
-	get:		snd_rme96_control_spdif_mask_get,
-	private_value:	IEC958_AES0_NONAUDIO |
+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+	.info =		snd_rme96_control_spdif_mask_info,
+	.get =		snd_rme96_control_spdif_mask_get,
+	.private_value = IEC958_AES0_NONAUDIO |
 			IEC958_AES0_PROFESSIONAL |
 			IEC958_AES0_CON_EMPHASIS
 },
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
-	info:		snd_rme96_control_spdif_mask_info,
-	get:		snd_rme96_control_spdif_mask_get,
-	private_value:	IEC958_AES0_NONAUDIO |
+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
+	.info =		snd_rme96_control_spdif_mask_info,
+	.get =		snd_rme96_control_spdif_mask_get,
+	.private_value = IEC958_AES0_NONAUDIO |
 			IEC958_AES0_PROFESSIONAL |
 			IEC958_AES0_PRO_EMPHASIS
 },
 {
-        iface:          SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           "Input Connector",
-	info:           snd_rme96_info_inputtype_control, 
-	get:            snd_rme96_get_inputtype_control,
-	put:            snd_rme96_put_inputtype_control 
+        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =         "Input Connector",
+	.info =         snd_rme96_info_inputtype_control, 
+	.get =          snd_rme96_get_inputtype_control,
+	.put =          snd_rme96_put_inputtype_control 
 },
 {
-        iface:          SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           "Loopback Input",
-	info:           snd_rme96_info_loopback_control,
-	get:            snd_rme96_get_loopback_control,
-	put:            snd_rme96_put_loopback_control
+        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =         "Loopback Input",
+	.info =         snd_rme96_info_loopback_control,
+	.get =          snd_rme96_get_loopback_control,
+	.put =          snd_rme96_put_loopback_control
 },
 {
-        iface:          SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           "Clock Mode",
-	info:           snd_rme96_info_clockmode_control, 
-	get:            snd_rme96_get_clockmode_control,
-	put:            snd_rme96_put_clockmode_control
+        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =         "Clock Mode",
+	.info =         snd_rme96_info_clockmode_control, 
+	.get =          snd_rme96_get_clockmode_control,
+	.put =          snd_rme96_put_clockmode_control
 },
 {
-        iface:          SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           "Monitor Tracks",
-	info:           snd_rme96_info_montracks_control, 
-	get:            snd_rme96_get_montracks_control,
-	put:            snd_rme96_put_montracks_control
+        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =         "Monitor Tracks",
+	.info =         snd_rme96_info_montracks_control, 
+	.get =          snd_rme96_get_montracks_control,
+	.put =          snd_rme96_put_montracks_control
 },
 {
-        iface:          SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           "Attenuation",
-	info:           snd_rme96_info_attenuation_control, 
-	get:            snd_rme96_get_attenuation_control,
-	put:            snd_rme96_put_attenuation_control
+        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =         "Attenuation",
+	.info =         snd_rme96_info_attenuation_control, 
+	.get =          snd_rme96_get_attenuation_control,
+	.put =          snd_rme96_put_attenuation_control
 },
 {
-        iface:          SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           "DAC Playback Volume",
-	info:           snd_rme96_dac_volume_info,
-	get:            snd_rme96_dac_volume_get,
-	put:            snd_rme96_dac_volume_put
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =         "DAC Playback Volume",
+	.info =         snd_rme96_dac_volume_info,
+	.get =          snd_rme96_dac_volume_get,
+	.put =          snd_rme96_dac_volume_put
 }
 };
 
@@ -2477,10 +2477,10 @@ static void __devexit snd_rme96_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "RME Digi96",
-	id_table: snd_rme96_ids,
-	probe: snd_rme96_probe,
-	remove: __devexit_p(snd_rme96_remove),
+	.name = "RME Digi96",
+	.id_table = snd_rme96_ids,
+	.probe = snd_rme96_probe,
+	.remove = __devexit_p(snd_rme96_remove),
 };
 
 static int __init alsa_card_rme96_init(void)
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 629564376bf7..4f8f085dc16e 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -1022,16 +1022,16 @@ static int snd_hdsp_midi_output_close(snd_rawmidi_substream_t * substream)
 
 snd_rawmidi_ops_t snd_hdsp_midi_output =
 {
-	open:		snd_hdsp_midi_output_open,
-	close:		snd_hdsp_midi_output_close,
-	trigger:	snd_hdsp_midi_output_trigger,
+	.open =		snd_hdsp_midi_output_open,
+	.close =	snd_hdsp_midi_output_close,
+	.trigger =	snd_hdsp_midi_output_trigger,
 };
 
 snd_rawmidi_ops_t snd_hdsp_midi_input =
 {
-	open:		snd_hdsp_midi_input_open,
-	close:		snd_hdsp_midi_input_close,
-	trigger:	snd_hdsp_midi_input_trigger,
+	.open =		snd_hdsp_midi_input_open,
+	.close =	snd_hdsp_midi_input_close,
+	.trigger =	snd_hdsp_midi_input_trigger,
 };
 
 static int __devinit snd_hdsp_create_midi (snd_card_t *card, hdsp_t *hdsp, int id)
@@ -1166,9 +1166,9 @@ static int snd_hdsp_control_spdif_mask_get(snd_kcontrol_t * kcontrol, snd_ctl_el
 }
 
 #define HDSP_SPDIF_IN(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_hdsp_info_spdif_in, \
-  get: snd_hdsp_get_spdif_in, put: snd_hdsp_put_spdif_in }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_hdsp_info_spdif_in, \
+  .get = snd_hdsp_get_spdif_in, .put = snd_hdsp_put_spdif_in }
 
 static unsigned int hdsp_spdif_in(hdsp_t *hdsp)
 {
@@ -1226,9 +1226,9 @@ static int snd_hdsp_put_spdif_in(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define HDSP_SPDIF_OUT(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_hdsp_info_spdif_out, \
-  get: snd_hdsp_get_spdif_out, put: snd_hdsp_put_spdif_out }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_hdsp_info_spdif_out, \
+  .get = snd_hdsp_get_spdif_out, .put = snd_hdsp_put_spdif_out }
 
 static int hdsp_spdif_out(hdsp_t *hdsp)
 {
@@ -1284,9 +1284,9 @@ static int snd_hdsp_put_spdif_out(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
 }
 
 #define HDSP_SYNC_PREF(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_hdsp_info_sync_pref, \
-  get: snd_hdsp_get_sync_pref, put: snd_hdsp_put_sync_pref }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_hdsp_info_sync_pref, \
+  .get = snd_hdsp_get_sync_pref, .put = snd_hdsp_put_sync_pref }
 
 static int hdsp_sync_pref(hdsp_t *hdsp)
 {
@@ -1399,10 +1399,10 @@ static int snd_hdsp_put_sync_pref(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
 }
 
 #define HDSP_PASSTHRU(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_hdsp_info_passthru, \
-  put: snd_hdsp_put_passthru, \
-  get: snd_hdsp_get_passthru }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_hdsp_info_passthru, \
+  .put = snd_hdsp_put_passthru, \
+  .get = snd_hdsp_get_passthru }
 
 static int snd_hdsp_info_passthru(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1445,9 +1445,9 @@ static int snd_hdsp_put_passthru(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define HDSP_LINE_OUT(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_hdsp_info_line_out, \
-  get: snd_hdsp_get_line_out, put: snd_hdsp_put_line_out }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_hdsp_info_line_out, \
+  .get = snd_hdsp_get_line_out, .put = snd_hdsp_put_line_out }
 
 static int hdsp_line_out(hdsp_t *hdsp)
 {
@@ -1503,9 +1503,9 @@ static int snd_hdsp_put_line_out(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define HDSP_MIXER(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_hdsp_info_mixer, \
-  get: snd_hdsp_get_mixer, put: snd_hdsp_put_mixer }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_hdsp_info_mixer, \
+  .get = snd_hdsp_get_mixer, .put = snd_hdsp_put_mixer }
 
 static int snd_hdsp_info_mixer(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1577,11 +1577,11 @@ static int snd_hdsp_put_mixer(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
 */
 
 #define HDSP_PLAYBACK_MIXER \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, \
-  access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE | \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE | \
 		 SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  info: snd_hdsp_info_playback_mixer, \
-  get: snd_hdsp_get_playback_mixer, put: snd_hdsp_put_playback_mixer }
+  .info = snd_hdsp_info_playback_mixer, \
+  .get = snd_hdsp_get_playback_mixer, .put = snd_hdsp_put_playback_mixer }
 
 static int snd_hdsp_info_playback_mixer(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1634,10 +1634,10 @@ static int snd_hdsp_put_playback_mixer(snd_kcontrol_t * kcontrol, snd_ctl_elem_v
 }
 
 #define HDSP_PEAK_PLAYBACK \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \
-  access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  info: snd_hdsp_info_peak_playback, \
-  get: snd_hdsp_get_peak_playback \
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_hdsp_info_peak_playback, \
+  .get = snd_hdsp_get_peak_playback \
 }
 
 static int snd_hdsp_info_peak_playback(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1657,10 +1657,10 @@ static int snd_hdsp_get_peak_playback(snd_kcontrol_t * kcontrol, snd_ctl_elem_va
 }
 
 #define HDSP_PEAK_INPUT \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \
-  access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  info: snd_hdsp_info_peak_input, \
-  get: snd_hdsp_get_peak_input \
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_hdsp_info_peak_input, \
+  .get = snd_hdsp_get_peak_input \
 }
 
 static int snd_hdsp_info_peak_input(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1680,10 +1680,10 @@ static int snd_hdsp_get_peak_input(snd_kcontrol_t * kcontrol, snd_ctl_elem_value
 }
 
 #define HDSP_PEAK_OUTPUT \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \
-  access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  info: snd_hdsp_info_peak_output, \
-  get: snd_hdsp_get_peak_output \
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_hdsp_info_peak_output, \
+  .get = snd_hdsp_get_peak_output \
 }
 
 static int snd_hdsp_info_peak_output(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1703,10 +1703,10 @@ static int snd_hdsp_get_peak_output(snd_kcontrol_t * kcontrol, snd_ctl_elem_valu
 }
 
 #define HDSP_RMS_INPUT \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \
-  access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  info: snd_hdsp_info_rms_input, \
-  get: snd_hdsp_get_rms_input \
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_hdsp_info_rms_input, \
+  .get = snd_hdsp_get_rms_input \
 }
 
 static int snd_hdsp_info_rms_input(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1724,10 +1724,10 @@ static int snd_hdsp_get_rms_input(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
 }
 
 #define HDSP_RMS_PLAYBACK \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \
-  access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  info: snd_hdsp_info_rms_playback, \
-  get: snd_hdsp_get_rms_playback \
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_hdsp_info_rms_playback, \
+  .get = snd_hdsp_get_rms_playback \
 }
 
 static int snd_hdsp_info_rms_playback(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1746,37 +1746,37 @@ static int snd_hdsp_get_rms_playback(snd_kcontrol_t * kcontrol, snd_ctl_elem_val
 
 static snd_kcontrol_new_t snd_hdsp_controls[] = {
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-	info:		snd_hdsp_control_spdif_info,
-	get:		snd_hdsp_control_spdif_get,
-	put:		snd_hdsp_control_spdif_put,
+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+	.info =		snd_hdsp_control_spdif_info,
+	.get =		snd_hdsp_control_spdif_get,
+	.put =		snd_hdsp_control_spdif_put,
 },
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
-	info:		snd_hdsp_control_spdif_stream_info,
-	get:		snd_hdsp_control_spdif_stream_get,
-	put:		snd_hdsp_control_spdif_stream_put,
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
+	.info =		snd_hdsp_control_spdif_stream_info,
+	.get =		snd_hdsp_control_spdif_stream_get,
+	.put =		snd_hdsp_control_spdif_stream_put,
 },
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
-	info:		snd_hdsp_control_spdif_mask_info,
-	get:		snd_hdsp_control_spdif_mask_get,
-	private_value:	IEC958_AES0_NONAUDIO |
+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+	.info =		snd_hdsp_control_spdif_mask_info,
+	.get =		snd_hdsp_control_spdif_mask_get,
+	.private_value = IEC958_AES0_NONAUDIO |
 			IEC958_AES0_PROFESSIONAL |
 			IEC958_AES0_CON_EMPHASIS,	                                                                                      
 },
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
-	info:		snd_hdsp_control_spdif_mask_info,
-	get:		snd_hdsp_control_spdif_mask_get,
-	private_value:	IEC958_AES0_NONAUDIO |
+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
+	.info =		snd_hdsp_control_spdif_mask_info,
+	.get =		snd_hdsp_control_spdif_mask_get,
+	.private_value = IEC958_AES0_NONAUDIO |
 			IEC958_AES0_PROFESSIONAL |
 			IEC958_AES0_PRO_EMPHASIS,
 },
@@ -2546,53 +2546,53 @@ static int snd_hdsp_prepare(snd_pcm_substream_t *substream)
 
 static snd_pcm_hardware_t snd_hdsp_playback_subinfo =
 {
-	info:			(SNDRV_PCM_INFO_MMAP |
+	.info =			(SNDRV_PCM_INFO_MMAP |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_NONINTERLEAVED |
 				 SNDRV_PCM_INFO_SYNC_START |
 				 SNDRV_PCM_INFO_DOUBLE),
-	formats:		SNDRV_PCM_FMTBIT_S32_LE,
-	rates:			(SNDRV_PCM_RATE_32000 |
+	.formats =		SNDRV_PCM_FMTBIT_S32_LE,
+	.rates =		(SNDRV_PCM_RATE_32000 |
 				 SNDRV_PCM_RATE_44100 | 
 				 SNDRV_PCM_RATE_48000 | 
 				 SNDRV_PCM_RATE_64000 | 
 				 SNDRV_PCM_RATE_88200 | 
 				 SNDRV_PCM_RATE_96000),
-	rate_min:		32000,
-	rate_max:		96000,
-	channels_min:		10,
-	channels_max:		HDSP_MAX_CHANNELS,
-	buffer_bytes_max:	1024*1024,
-	period_bytes_min:	1,
-	period_bytes_max:	1024*1024,
-	periods_min:		2,
-	periods_max:		2,
-	fifo_size:		0,
+	.rate_min =		32000,
+	.rate_max =		96000,
+	.channels_min =		10,
+	.channels_max =		HDSP_MAX_CHANNELS,
+	.buffer_bytes_max =	1024*1024,
+	.period_bytes_min =	1,
+	.period_bytes_max =	1024*1024,
+	.periods_min =		2,
+	.periods_max =		2,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_hdsp_capture_subinfo =
 {
-	info:			(SNDRV_PCM_INFO_MMAP |
+	.info =			(SNDRV_PCM_INFO_MMAP |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_NONINTERLEAVED |
 				 SNDRV_PCM_INFO_SYNC_START),
-	formats:		SNDRV_PCM_FMTBIT_S32_LE,
-	rates:			(SNDRV_PCM_RATE_32000 |
+	.formats =		SNDRV_PCM_FMTBIT_S32_LE,
+	.rates =		(SNDRV_PCM_RATE_32000 |
 				 SNDRV_PCM_RATE_44100 | 
 				 SNDRV_PCM_RATE_48000 | 
 				 SNDRV_PCM_RATE_64000 | 
 				 SNDRV_PCM_RATE_88200 | 
 				 SNDRV_PCM_RATE_96000),
-	rate_min:		32000,
-	rate_max:		96000,
-	channels_min:		10,
-	channels_max:		HDSP_MAX_CHANNELS,
-	buffer_bytes_max:	1024*1024,
-	period_bytes_min:	1,
-	period_bytes_max:	1024*1024,
-	periods_min:		2,
-	periods_max:		2,
-	fifo_size:		0,
+	.rate_min =		32000,
+	.rate_max =		96000,
+	.channels_min =		10,
+	.channels_max =		HDSP_MAX_CHANNELS,
+	.buffer_bytes_max =	1024*1024,
+	.period_bytes_min =	1,
+	.period_bytes_max =	1024*1024,
+	.periods_min =		2,
+	.periods_max =		2,
+	.fifo_size =		0,
 };
 
 static unsigned int period_sizes[] = { 64, 128, 256, 512, 1024, 2048, 4096, 8192 };
@@ -2600,9 +2600,9 @@ static unsigned int period_sizes[] = { 64, 128, 256, 512, 1024, 2048, 4096, 8192
 #define PERIOD_SIZES sizeof(period_sizes) / sizeof(period_sizes[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_period_sizes = {
-	count: PERIOD_SIZES,
-	list: period_sizes,
-	mask: 0
+	.count = PERIOD_SIZES,
+	.list = period_sizes,
+	.mask = 0
 };
 
 static int snd_hdsp_hw_rule_channels(snd_pcm_hw_params_t *params,
@@ -2785,26 +2785,26 @@ static int snd_hdsp_capture_release(snd_pcm_substream_t *substream)
 }
 
 static snd_pcm_ops_t snd_hdsp_playback_ops = {
-	open:		snd_hdsp_playback_open,
-	close:		snd_hdsp_playback_release,
-	ioctl:		snd_hdsp_ioctl,
-	hw_params:	snd_hdsp_hw_params,
-	prepare:	snd_hdsp_prepare,
-	trigger:	snd_hdsp_trigger,
-	pointer:	snd_hdsp_hw_pointer,
-	copy:		snd_hdsp_playback_copy,
-	silence:	snd_hdsp_hw_silence,
+	.open =		snd_hdsp_playback_open,
+	.close =	snd_hdsp_playback_release,
+	.ioctl =	snd_hdsp_ioctl,
+	.hw_params =	snd_hdsp_hw_params,
+	.prepare =	snd_hdsp_prepare,
+	.trigger =	snd_hdsp_trigger,
+	.pointer =	snd_hdsp_hw_pointer,
+	.copy =		snd_hdsp_playback_copy,
+	.silence =	snd_hdsp_hw_silence,
 };
 
 static snd_pcm_ops_t snd_hdsp_capture_ops = {
-	open:		snd_hdsp_capture_open,
-	close:		snd_hdsp_capture_release,
-	ioctl:		snd_hdsp_ioctl,
-	hw_params:	snd_hdsp_hw_params,
-	prepare:	snd_hdsp_prepare,
-	trigger:	snd_hdsp_trigger,
-	pointer:	snd_hdsp_hw_pointer,
-	copy:		snd_hdsp_capture_copy,
+	.open =		snd_hdsp_capture_open,
+	.close =	snd_hdsp_capture_release,
+	.ioctl =	snd_hdsp_ioctl,
+	.hw_params =	snd_hdsp_hw_params,
+	.prepare =	snd_hdsp_prepare,
+	.trigger =	snd_hdsp_trigger,
+	.pointer =	snd_hdsp_hw_pointer,
+	.copy =		snd_hdsp_capture_copy,
 };
 
 static int __devinit snd_hdsp_create_pcm(snd_card_t *card,
@@ -3115,10 +3115,10 @@ static void __devexit snd_hdsp_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name:"RME Hammerfall DSP",
-	id_table:snd_hdsp_ids,
-	probe:snd_hdsp_probe,
-	remove:__devexit_p(snd_hdsp_remove),
+	.name = "RME Hammerfall DSP",
+	.id_table = snd_hdsp_ids,
+	.probe = snd_hdsp_probe,
+	.remove = __devexit_p(snd_hdsp_remove),
 };
 
 static int __init alsa_card_hdsp_init(void)
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 5f2dc3d85616..521e5e4ca617 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -878,10 +878,10 @@ static int snd_rme9652_control_spdif_mask_get(snd_kcontrol_t * kcontrol, snd_ctl
 }
 
 #define RME9652_ADAT1_IN(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_rme9652_info_adat1_in, \
-  get: snd_rme9652_get_adat1_in, \
-  put: snd_rme9652_put_adat1_in }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_rme9652_info_adat1_in, \
+  .get = snd_rme9652_get_adat1_in, \
+  .put = snd_rme9652_put_adat1_in }
 
 static unsigned int rme9652_adat1_in(rme9652_t *rme9652)
 {
@@ -958,9 +958,9 @@ static int snd_rme9652_put_adat1_in(snd_kcontrol_t * kcontrol, snd_ctl_elem_valu
 }
 
 #define RME9652_SPDIF_IN(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_rme9652_info_spdif_in, \
-  get: snd_rme9652_get_spdif_in, put: snd_rme9652_put_spdif_in }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_rme9652_info_spdif_in, \
+  .get = snd_rme9652_get_spdif_in, .put = snd_rme9652_put_spdif_in }
 
 static unsigned int rme9652_spdif_in(rme9652_t *rme9652)
 {
@@ -1031,9 +1031,9 @@ static int snd_rme9652_put_spdif_in(snd_kcontrol_t * kcontrol, snd_ctl_elem_valu
 }
 
 #define RME9652_SPDIF_OUT(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_rme9652_info_spdif_out, \
-  get: snd_rme9652_get_spdif_out, put: snd_rme9652_put_spdif_out }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_rme9652_info_spdif_out, \
+  .get = snd_rme9652_get_spdif_out, .put = snd_rme9652_put_spdif_out }
 
 static int rme9652_spdif_out(rme9652_t *rme9652)
 {
@@ -1101,9 +1101,9 @@ static int snd_rme9652_put_spdif_out(snd_kcontrol_t * kcontrol, snd_ctl_elem_val
 }
 
 #define RME9652_SYNC_MODE(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_rme9652_info_sync_mode, \
-  get: snd_rme9652_get_sync_mode, put: snd_rme9652_put_sync_mode }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_rme9652_info_sync_mode, \
+  .get = snd_rme9652_get_sync_mode, .put = snd_rme9652_put_sync_mode }
 
 static int rme9652_sync_mode(rme9652_t *rme9652)
 {
@@ -1188,9 +1188,9 @@ static int snd_rme9652_put_sync_mode(snd_kcontrol_t * kcontrol, snd_ctl_elem_val
 }
 
 #define RME9652_SYNC_PREF(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_rme9652_info_sync_pref, \
-  get: snd_rme9652_get_sync_pref, put: snd_rme9652_put_sync_pref }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_rme9652_info_sync_pref, \
+  .get = snd_rme9652_get_sync_pref, .put = snd_rme9652_put_sync_pref }
 
 static int rme9652_sync_pref(rme9652_t *rme9652)
 {
@@ -1336,10 +1336,10 @@ static int snd_rme9652_put_thru(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define RME9652_PASSTHRU(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  info: snd_rme9652_info_passthru, \
-  put: snd_rme9652_put_passthru, \
-  get: snd_rme9652_get_passthru }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .info = snd_rme9652_info_passthru, \
+  .put = snd_rme9652_put_passthru, \
+  .get = snd_rme9652_get_passthru }
 
 static int snd_rme9652_info_passthru(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1384,10 +1384,10 @@ static int snd_rme9652_put_passthru(snd_kcontrol_t * kcontrol, snd_ctl_elem_valu
 /* Read-only switches */
 
 #define RME9652_SPDIF_RATE(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  info: snd_rme9652_info_spdif_rate, \
-  get: snd_rme9652_get_spdif_rate }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_rme9652_info_spdif_rate, \
+  .get = snd_rme9652_get_spdif_rate }
 
 static int snd_rme9652_info_spdif_rate(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1410,10 +1410,10 @@ static int snd_rme9652_get_spdif_rate(snd_kcontrol_t * kcontrol, snd_ctl_elem_va
 }
 
 #define RME9652_ADAT_SYNC(xname, xindex, xidx) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  info: snd_rme9652_info_adat_sync, \
-  get: snd_rme9652_get_adat_sync, private_value: xidx }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_rme9652_info_adat_sync, \
+  .get = snd_rme9652_get_adat_sync, .private_value = xidx }
 
 static int snd_rme9652_info_adat_sync(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1446,10 +1446,10 @@ static int snd_rme9652_get_adat_sync(snd_kcontrol_t * kcontrol, snd_ctl_elem_val
 }
 
 #define RME9652_TC_VALID(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \
-  access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  info: snd_rme9652_info_tc_valid, \
-  get: snd_rme9652_get_tc_valid }
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_rme9652_info_tc_valid, \
+  .get = snd_rme9652_get_tc_valid }
 
 static int snd_rme9652_info_tc_valid(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1530,37 +1530,37 @@ static int snd_rme9652_get_tc_value(void *private_data,
 
 static snd_kcontrol_new_t snd_rme9652_controls[] = {
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-	info:		snd_rme9652_control_spdif_info,
-	get:		snd_rme9652_control_spdif_get,
-	put:		snd_rme9652_control_spdif_put,
+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+	.info =		snd_rme9652_control_spdif_info,
+	.get =		snd_rme9652_control_spdif_get,
+	.put =		snd_rme9652_control_spdif_put,
 },
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
-	info:		snd_rme9652_control_spdif_stream_info,
-	get:		snd_rme9652_control_spdif_stream_get,
-	put:		snd_rme9652_control_spdif_stream_put,
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
+	.info =		snd_rme9652_control_spdif_stream_info,
+	.get =		snd_rme9652_control_spdif_stream_get,
+	.put =		snd_rme9652_control_spdif_stream_put,
 },
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
-	info:		snd_rme9652_control_spdif_mask_info,
-	get:		snd_rme9652_control_spdif_mask_get,
-	private_value:	IEC958_AES0_NONAUDIO |
+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+	.info =		snd_rme9652_control_spdif_mask_info,
+	.get =		snd_rme9652_control_spdif_mask_get,
+	.private_value = IEC958_AES0_NONAUDIO |
 			IEC958_AES0_PROFESSIONAL |
 			IEC958_AES0_CON_EMPHASIS,	                                                                                      
 },
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
-	info:		snd_rme9652_control_spdif_mask_info,
-	get:		snd_rme9652_control_spdif_mask_get,
-	private_value:	IEC958_AES0_NONAUDIO |
+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
+	.info =		snd_rme9652_control_spdif_mask_info,
+	.get =		snd_rme9652_control_spdif_mask_get,
+	.private_value = IEC958_AES0_NONAUDIO |
 			IEC958_AES0_PROFESSIONAL |
 			IEC958_AES0_PRO_EMPHASIS,
 },
@@ -1569,12 +1569,12 @@ RME9652_SPDIF_OUT("IEC958 Output also on ADAT1", 0),
 RME9652_SYNC_MODE("Sync Mode", 0),
 RME9652_SYNC_PREF("Preferred Sync Source", 0),
 {
-	iface: SNDRV_CTL_ELEM_IFACE_PCM,
-	name: "Channels Thru",
-	index: 0,
-	info: snd_rme9652_info_thru,
-	get: snd_rme9652_get_thru,
-	put: snd_rme9652_put_thru,
+	.iface = SNDRV_CTL_ELEM_IFACE_PCM,
+	.name = "Channels Thru",
+	.index = 0,
+	.info = snd_rme9652_info_thru,
+	.get = snd_rme9652_get_thru,
+	.put = snd_rme9652_put_thru,
 },
 RME9652_SPDIF_RATE("IEC958 Sample Rate", 0),
 RME9652_ADAT_SYNC("ADAT1 Sync Check", 0, 0),
@@ -2265,49 +2265,49 @@ static int snd_rme9652_prepare(snd_pcm_substream_t *substream)
 
 static snd_pcm_hardware_t snd_rme9652_playback_subinfo =
 {
-	info:			(SNDRV_PCM_INFO_MMAP |
+	.info =			(SNDRV_PCM_INFO_MMAP |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_NONINTERLEAVED |
 				 SNDRV_PCM_INFO_SYNC_START |
 				 SNDRV_PCM_INFO_DOUBLE),
-	formats:		SNDRV_PCM_FMTBIT_S32_LE,
-	rates:			(SNDRV_PCM_RATE_44100 | 
+	.formats =		SNDRV_PCM_FMTBIT_S32_LE,
+	.rates =		(SNDRV_PCM_RATE_44100 | 
 				 SNDRV_PCM_RATE_48000 | 
 				 SNDRV_PCM_RATE_88200 | 
 				 SNDRV_PCM_RATE_96000),
-	rate_min:		44100,
-	rate_max:		96000,
-	channels_min:		10,
-	channels_max:		26,
-	buffer_bytes_max:	1024*1024,
-	period_bytes_min:	1,
-	period_bytes_max:	1024*1024,
-	periods_min:		2,
-	periods_max:		2,
-	fifo_size:		0,
+	.rate_min =		44100,
+	.rate_max =		96000,
+	.channels_min =		10,
+	.channels_max =		26,
+	.buffer_bytes_max =	1024*1024,
+	.period_bytes_min =	1,
+	.period_bytes_max =	1024*1024,
+	.periods_min =		2,
+	.periods_max =		2,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_rme9652_capture_subinfo =
 {
-	info:			(SNDRV_PCM_INFO_MMAP |
+	.info =			(SNDRV_PCM_INFO_MMAP |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_NONINTERLEAVED |
 				 SNDRV_PCM_INFO_SYNC_START),
-	formats:		SNDRV_PCM_FMTBIT_S32_LE,
-	rates:			(SNDRV_PCM_RATE_44100 | 
+	.formats =		SNDRV_PCM_FMTBIT_S32_LE,
+	.rates =		(SNDRV_PCM_RATE_44100 | 
 				 SNDRV_PCM_RATE_48000 | 
 				 SNDRV_PCM_RATE_88200 | 
 				 SNDRV_PCM_RATE_96000),
-	rate_min:		44100,
-	rate_max:		96000,
-	channels_min:		10,
-	channels_max:		26,
-	buffer_bytes_max:	1024*1024,
-	period_bytes_min:	1,
-	period_bytes_max:	1024*1024,
-	periods_min:		2,
-	periods_max:		2,
-	fifo_size:		0,
+	.rate_min =		44100,
+	.rate_max =		96000,
+	.channels_min =		10,
+	.channels_max =		26,
+	.buffer_bytes_max =	1024*1024,
+	.period_bytes_min =	1,
+	.period_bytes_max =	1024*1024,
+	.periods_min =		2,
+	.periods_max =		2,
+	.fifo_size =		0,
 };
 
 static unsigned int period_sizes[] = { 64, 128, 256, 512, 1024, 2048, 4096, 8192 };
@@ -2315,9 +2315,9 @@ static unsigned int period_sizes[] = { 64, 128, 256, 512, 1024, 2048, 4096, 8192
 #define PERIOD_SIZES sizeof(period_sizes) / sizeof(period_sizes[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_period_sizes = {
-	count: PERIOD_SIZES,
-	list: period_sizes,
-	mask: 0
+	.count = PERIOD_SIZES,
+	.list = period_sizes,
+	.mask = 0
 };
 
 static int snd_rme9652_hw_rule_channels(snd_pcm_hw_params_t *params,
@@ -2492,26 +2492,26 @@ static int snd_rme9652_capture_release(snd_pcm_substream_t *substream)
 }
 
 static snd_pcm_ops_t snd_rme9652_playback_ops = {
-	open:		snd_rme9652_playback_open,
-	close:		snd_rme9652_playback_release,
-	ioctl:		snd_rme9652_ioctl,
-	hw_params:	snd_rme9652_hw_params,
-	prepare:	snd_rme9652_prepare,
-	trigger:	snd_rme9652_trigger,
-	pointer:	snd_rme9652_hw_pointer,
-	copy:		snd_rme9652_playback_copy,
-	silence:	snd_rme9652_hw_silence,
+	.open =		snd_rme9652_playback_open,
+	.close =	snd_rme9652_playback_release,
+	.ioctl =	snd_rme9652_ioctl,
+	.hw_params =	snd_rme9652_hw_params,
+	.prepare =	snd_rme9652_prepare,
+	.trigger =	snd_rme9652_trigger,
+	.pointer =	snd_rme9652_hw_pointer,
+	.copy =		snd_rme9652_playback_copy,
+	.silence =	snd_rme9652_hw_silence,
 };
 
 static snd_pcm_ops_t snd_rme9652_capture_ops = {
-	open:		snd_rme9652_capture_open,
-	close:		snd_rme9652_capture_release,
-	ioctl:		snd_rme9652_ioctl,
-	hw_params:	snd_rme9652_hw_params,
-	prepare:	snd_rme9652_prepare,
-	trigger:	snd_rme9652_trigger,
-	pointer:	snd_rme9652_hw_pointer,
-	copy:		snd_rme9652_capture_copy,
+	.open =		snd_rme9652_capture_open,
+	.close =	snd_rme9652_capture_release,
+	.ioctl =	snd_rme9652_ioctl,
+	.hw_params =	snd_rme9652_hw_params,
+	.prepare =	snd_rme9652_prepare,
+	.trigger =	snd_rme9652_trigger,
+	.pointer =	snd_rme9652_hw_pointer,
+	.copy =		snd_rme9652_capture_copy,
 };
 
 static int __init snd_rme9652_create_pcm(snd_card_t *card,
@@ -2733,10 +2733,10 @@ static void __devexit snd_rme9652_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name:"RME Digi9652 (Hammerfall)",
-	id_table:snd_rme9652_ids,
-	probe:snd_rme9652_probe,
-	remove:__devexit_p(snd_rme9652_remove),
+	.name ="RME Digi9652 (Hammerfall)",
+	.id_table = snd_rme9652_ids,
+	.probe = snd_rme9652_probe,
+	.remove = __devexit_p(snd_rme9652_remove),
 };
 
 static int __init alsa_card_hammerfall_init(void)
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 0a476c89c5ed..9da152d118f1 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -759,40 +759,40 @@ static snd_pcm_uframes_t snd_sonicvibes_capture_pointer(snd_pcm_substream_t * su
 
 static snd_pcm_hardware_t snd_sonicvibes_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(128*1024),
-	period_bytes_min:	32,
-	period_bytes_max:	(128*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(128*1024),
+	.period_bytes_min =	32,
+	.period_bytes_max =	(128*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_sonicvibes_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(128*1024),
-	period_bytes_min:	32,
-	period_bytes_max:	(128*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(128*1024),
+	.period_bytes_min =	32,
+	.period_bytes_max =	(128*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static int snd_sonicvibes_playback_open(snd_pcm_substream_t * substream)
@@ -839,25 +839,25 @@ static int snd_sonicvibes_capture_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_sonicvibes_playback_ops = {
-	open:		snd_sonicvibes_playback_open,
-	close:		snd_sonicvibes_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_sonicvibes_hw_params,
-	hw_free:	snd_sonicvibes_hw_free,
-	prepare:	snd_sonicvibes_playback_prepare,
-	trigger:	snd_sonicvibes_playback_trigger,
-	pointer:	snd_sonicvibes_playback_pointer,
+	.open =		snd_sonicvibes_playback_open,
+	.close =	snd_sonicvibes_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_sonicvibes_hw_params,
+	.hw_free =	snd_sonicvibes_hw_free,
+	.prepare =	snd_sonicvibes_playback_prepare,
+	.trigger =	snd_sonicvibes_playback_trigger,
+	.pointer =	snd_sonicvibes_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_sonicvibes_capture_ops = {
-	open:		snd_sonicvibes_capture_open,
-	close:		snd_sonicvibes_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_sonicvibes_hw_params,
-	hw_free:	snd_sonicvibes_hw_free,
-	prepare:	snd_sonicvibes_capture_prepare,
-	trigger:	snd_sonicvibes_capture_trigger,
-	pointer:	snd_sonicvibes_capture_pointer,
+	.open =		snd_sonicvibes_capture_open,
+	.close =	snd_sonicvibes_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_sonicvibes_hw_params,
+	.hw_free =	snd_sonicvibes_hw_free,
+	.prepare =	snd_sonicvibes_capture_prepare,
+	.trigger =	snd_sonicvibes_capture_trigger,
+	.pointer =	snd_sonicvibes_capture_pointer,
 };
 
 static void snd_sonicvibes_pcm_free(snd_pcm_t *pcm)
@@ -897,9 +897,9 @@ static int __devinit snd_sonicvibes_pcm(sonicvibes_t * sonic, int device, snd_pc
  */
 
 #define SONICVIBES_MUX(xname, xindex) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_sonicvibes_info_mux, \
-  get: snd_sonicvibes_get_mux, put: snd_sonicvibes_put_mux }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_sonicvibes_info_mux, \
+  .get = snd_sonicvibes_get_mux, .put = snd_sonicvibes_put_mux }
 
 static int snd_sonicvibes_info_mux(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -953,10 +953,10 @@ static int snd_sonicvibes_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
 }
 
 #define SONICVIBES_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_sonicvibes_info_single, \
-  get: snd_sonicvibes_get_single, put: snd_sonicvibes_put_single, \
-  private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_sonicvibes_info_single, \
+  .get = snd_sonicvibes_get_single, .put = snd_sonicvibes_put_single, \
+  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
 static int snd_sonicvibes_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1011,10 +1011,10 @@ static int snd_sonicvibes_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_val
 }
 
 #define SONICVIBES_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_sonicvibes_info_double, \
-  get: snd_sonicvibes_get_double, put: snd_sonicvibes_put_double, \
-  private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_sonicvibes_info_double, \
+  .get = snd_sonicvibes_get_double, .put = snd_sonicvibes_put_double, \
+  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
 
 static int snd_sonicvibes_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1258,7 +1258,7 @@ static int __devinit snd_sonicvibes_create(snd_card_t * card,
 	unsigned int dmaa, dmac;
 	int err;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_sonicvibes_dev_free,
+		.dev_free =	snd_sonicvibes_dev_free,
 	};
 
 	*rsonic = NULL;
@@ -1538,10 +1538,10 @@ static void __devexit snd_sonic_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "S3 SonicVibes",
-	id_table: snd_sonic_ids,
-	probe: snd_sonic_probe,
-	remove: __devexit_p(snd_sonic_remove),
+	.name = "S3 SonicVibes",
+	.id_table = snd_sonic_ids,
+	.probe = snd_sonic_probe,
+	.remove = __devexit_p(snd_sonic_remove),
 };
 
 static int __init alsa_card_sonicvibes_init(void)
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index fe1bfcbdbc33..17a3873febbf 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -210,13 +210,13 @@ static void snd_card_trident_resume(struct pci_dev *pci)
 #endif
 
 static struct pci_driver driver = {
-	name: "Trident4DWaveAudio",
-	id_table: snd_trident_ids,
-	probe: snd_trident_probe,
-	remove: __devexit_p(snd_trident_remove),
+	.name = "Trident4DWaveAudio",
+	.id_table = snd_trident_ids,
+	.probe = snd_trident_probe,
+	.remove = __devexit_p(snd_trident_remove),
 #ifdef CONFIG_PM
-	suspend: snd_card_trident_suspend,
-	resume: snd_card_trident_resume,
+	.suspend = snd_card_trident_suspend,
+	.resume = snd_card_trident_resume,
 #endif
 };
 
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 0d20f50a7d55..412e2d75abf3 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -1694,23 +1694,23 @@ static snd_pcm_uframes_t snd_trident_spdif_pointer(snd_pcm_substream_t * substre
 
 static snd_pcm_hardware_t snd_trident_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START |
 				 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
-	formats:		(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
+	.formats =		(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
 				 SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U16_LE),
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(256*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(256*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(256*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(256*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 /*
@@ -1719,23 +1719,23 @@ static snd_pcm_hardware_t snd_trident_playback =
 
 static snd_pcm_hardware_t snd_trident_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START |
 				 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
-	formats:		(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
+	.formats =		(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
 				 SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U16_LE),
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		4000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	(128*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(128*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		4000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	(128*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(128*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 /*
@@ -1744,22 +1744,22 @@ static snd_pcm_hardware_t snd_trident_capture =
 
 static snd_pcm_hardware_t snd_trident_foldback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START |
 				 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
-	formats:		SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_48000,
-	rate_min:		48000,
-	rate_max:		48000,
-	channels_min:		2,
-	channels_max:		2,
-	buffer_bytes_max:	(128*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(128*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_48000,
+	.rate_min =		48000,
+	.rate_max =		48000,
+	.channels_min =		2,
+	.channels_max =		2,
+	.buffer_bytes_max =	(128*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(128*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 /*
@@ -1768,23 +1768,23 @@ static snd_pcm_hardware_t snd_trident_foldback =
 
 static snd_pcm_hardware_t snd_trident_spdif =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START |
 				 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
-	formats:		SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			(SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
+	.formats =		SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		(SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
 				 SNDRV_PCM_RATE_48000),
-	rate_min:		32000,
-	rate_max:		48000,
-	channels_min:		2,
-	channels_max:		2,
-	buffer_bytes_max:	(128*1024),
-	period_bytes_min:	64,
-	period_bytes_max:	(128*1024),
-	periods_min:		1,
-	periods_max:		1024,
-	fifo_size:		0,
+	.rate_min =		32000,
+	.rate_max =		48000,
+	.channels_min =		2,
+	.channels_max =		2,
+	.buffer_bytes_max =	(128*1024),
+	.period_bytes_min =	64,
+	.period_bytes_max =	(128*1024),
+	.periods_min =		1,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static void snd_trident_pcm_free_substream(snd_pcm_runtime_t *runtime)
@@ -2025,58 +2025,58 @@ static int snd_trident_foldback_close(snd_pcm_substream_t * substream)
   ---------------------------------------------------------------------------*/
 
 static snd_pcm_ops_t snd_trident_playback_ops = {
-	open:		snd_trident_playback_open,
-	close:		snd_trident_playback_close,
-	ioctl:		snd_trident_ioctl,
-	hw_params:	snd_trident_playback_hw_params,
-	hw_free:	snd_trident_playback_hw_free,
-	prepare:	snd_trident_playback_prepare,
-	trigger:	snd_trident_trigger,
-	pointer:	snd_trident_playback_pointer,
+	.open =		snd_trident_playback_open,
+	.close =	snd_trident_playback_close,
+	.ioctl =	snd_trident_ioctl,
+	.hw_params =	snd_trident_playback_hw_params,
+	.hw_free =	snd_trident_playback_hw_free,
+	.prepare =	snd_trident_playback_prepare,
+	.trigger =	snd_trident_trigger,
+	.pointer =	snd_trident_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_trident_capture_ops = {
-	open:		snd_trident_capture_open,
-	close:		snd_trident_capture_close,
-	ioctl:		snd_trident_ioctl,
-	hw_params:	snd_trident_capture_hw_params,
-	hw_free:	snd_trident_capture_hw_free,
-	prepare:	snd_trident_capture_prepare,
-	trigger:	snd_trident_trigger,
-	pointer:	snd_trident_capture_pointer,
+	.open =		snd_trident_capture_open,
+	.close =	snd_trident_capture_close,
+	.ioctl =	snd_trident_ioctl,
+	.hw_params =	snd_trident_capture_hw_params,
+	.hw_free =	snd_trident_capture_hw_free,
+	.prepare =	snd_trident_capture_prepare,
+	.trigger =	snd_trident_trigger,
+	.pointer =	snd_trident_capture_pointer,
 };
 
 static snd_pcm_ops_t snd_trident_si7018_capture_ops = {
-	open:		snd_trident_capture_open,
-	close:		snd_trident_capture_close,
-	ioctl:		snd_trident_ioctl,
-	hw_params:	snd_trident_si7018_capture_hw_params,
-	hw_free:	snd_trident_si7018_capture_hw_free,
-	prepare:	snd_trident_si7018_capture_prepare,
-	trigger:	snd_trident_trigger,
-	pointer:	snd_trident_playback_pointer,
+	.open =		snd_trident_capture_open,
+	.close =	snd_trident_capture_close,
+	.ioctl =	snd_trident_ioctl,
+	.hw_params =	snd_trident_si7018_capture_hw_params,
+	.hw_free =	snd_trident_si7018_capture_hw_free,
+	.prepare =	snd_trident_si7018_capture_prepare,
+	.trigger =	snd_trident_trigger,
+	.pointer =	snd_trident_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_trident_foldback_ops = {
-	open:		snd_trident_foldback_open,
-	close:		snd_trident_foldback_close,
-	ioctl:		snd_trident_ioctl,
-	hw_params:	snd_trident_foldback_hw_params,
-	hw_free:	snd_trident_foldback_hw_free,
-	prepare:	snd_trident_foldback_prepare,
-	trigger:	snd_trident_trigger,
-	pointer:	snd_trident_playback_pointer,
+	.open =		snd_trident_foldback_open,
+	.close =	snd_trident_foldback_close,
+	.ioctl =	snd_trident_ioctl,
+	.hw_params =	snd_trident_foldback_hw_params,
+	.hw_free =	snd_trident_foldback_hw_free,
+	.prepare =	snd_trident_foldback_prepare,
+	.trigger =	snd_trident_trigger,
+	.pointer =	snd_trident_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_trident_spdif_ops = {
-	open:		snd_trident_spdif_open,
-	close:		snd_trident_spdif_close,
-	ioctl:		snd_trident_ioctl,
-	hw_params:	snd_trident_spdif_hw_params,
-	hw_free:	snd_trident_spdif_hw_free,
-	prepare:	snd_trident_spdif_prepare,
-	trigger:	snd_trident_trigger,
-	pointer:	snd_trident_spdif_pointer,
+	.open =		snd_trident_spdif_open,
+	.close =	snd_trident_spdif_close,
+	.ioctl =	snd_trident_ioctl,
+	.hw_params =	snd_trident_spdif_hw_params,
+	.hw_free =	snd_trident_spdif_hw_free,
+	.prepare =	snd_trident_spdif_prepare,
+	.trigger =	snd_trident_trigger,
+	.pointer =	snd_trident_spdif_pointer,
 };
 
 /*---------------------------------------------------------------------------
@@ -2293,12 +2293,12 @@ static int snd_trident_spdif_control_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_spdif_control __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH),
-	info:		snd_trident_spdif_control_info,
-	get:		snd_trident_spdif_control_get,
-	put:		snd_trident_spdif_control_put,
-	private_value:  0x28,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH),
+	.info =		snd_trident_spdif_control_info,
+	.get =		snd_trident_spdif_control_get,
+	.put =		snd_trident_spdif_control_put,
+	.private_value = 0x28,
 };
 
 /*---------------------------------------------------------------------------
@@ -2352,11 +2352,11 @@ static int snd_trident_spdif_default_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_spdif_default __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-	info:		snd_trident_spdif_default_info,
-	get:		snd_trident_spdif_default_get,
-	put:		snd_trident_spdif_default_put
+	.iface =		SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =           SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+	.info =		snd_trident_spdif_default_info,
+	.get =		snd_trident_spdif_default_get,
+	.put =		snd_trident_spdif_default_put
 };
 
 /*---------------------------------------------------------------------------
@@ -2384,11 +2384,11 @@ static int snd_trident_spdif_mask_get(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_spdif_mask __devinitdata =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
-	info:		snd_trident_spdif_mask_info,
-	get:		snd_trident_spdif_mask_get,
+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
+	.info =		snd_trident_spdif_mask_info,
+	.get =		snd_trident_spdif_mask_get,
 };
 
 /*---------------------------------------------------------------------------
@@ -2442,12 +2442,12 @@ static int snd_trident_spdif_stream_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_spdif_stream __devinitdata =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
-	info:		snd_trident_spdif_stream_info,
-	get:		snd_trident_spdif_stream_get,
-	put:		snd_trident_spdif_stream_put
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
+	.info =		snd_trident_spdif_stream_info,
+	.get =		snd_trident_spdif_stream_get,
+	.put =		snd_trident_spdif_stream_put
 };
 
 /*---------------------------------------------------------------------------
@@ -2501,12 +2501,12 @@ static int snd_trident_ac97_control_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_ac97_rear_control __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           "Rear Path",
-	info:		snd_trident_ac97_control_info,
-	get:		snd_trident_ac97_control_get,
-	put:		snd_trident_ac97_control_put,
-	private_value:  4,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =         "Rear Path",
+	.info =		snd_trident_ac97_control_info,
+	.get =		snd_trident_ac97_control_get,
+	.put =		snd_trident_ac97_control_put,
+	.private_value = 4,
 };
 
 /*---------------------------------------------------------------------------
@@ -2557,22 +2557,22 @@ static int snd_trident_vol_control_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_vol_music_control __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           "Music Playback Volume",
-	info:		snd_trident_vol_control_info,
-	get:		snd_trident_vol_control_get,
-	put:		snd_trident_vol_control_put,
-	private_value:  16,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =         "Music Playback Volume",
+	.info =		snd_trident_vol_control_info,
+	.get =		snd_trident_vol_control_get,
+	.put =		snd_trident_vol_control_put,
+	.private_value = 16,
 };
 
 static snd_kcontrol_new_t snd_trident_vol_wave_control __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           "Wave Playback Volume",
-	info:		snd_trident_vol_control_info,
-	get:		snd_trident_vol_control_get,
-	put:		snd_trident_vol_control_put,
-	private_value:  0,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =         "Wave Playback Volume",
+	.info =		snd_trident_vol_control_info,
+	.get =		snd_trident_vol_control_get,
+	.put =		snd_trident_vol_control_put,
+	.private_value = 0,
 };
 
 /*---------------------------------------------------------------------------
@@ -2633,12 +2633,12 @@ static int snd_trident_pcm_vol_control_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_pcm_vol_control __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           "PCM Front Playback Volume",
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	info:		snd_trident_pcm_vol_control_info,
-	get:		snd_trident_pcm_vol_control_get,
-	put:		snd_trident_pcm_vol_control_put,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =         "PCM Front Playback Volume",
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.info =		snd_trident_pcm_vol_control_info,
+	.get =		snd_trident_pcm_vol_control_get,
+	.put =		snd_trident_pcm_vol_control_put,
 };
 
 /*---------------------------------------------------------------------------
@@ -2694,12 +2694,12 @@ static int snd_trident_pcm_pan_control_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_pcm_pan_control __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           "PCM Pan Playback Control",
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	info:		snd_trident_pcm_pan_control_info,
-	get:		snd_trident_pcm_pan_control_get,
-	put:		snd_trident_pcm_pan_control_put,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =         "PCM Pan Playback Control",
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.info =		snd_trident_pcm_pan_control_info,
+	.get =		snd_trident_pcm_pan_control_get,
+	.put =		snd_trident_pcm_pan_control_put,
 };
 
 /*---------------------------------------------------------------------------
@@ -2747,12 +2747,12 @@ static int snd_trident_pcm_rvol_control_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_pcm_rvol_control __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           "PCM Reverb Playback Volume",
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	info:		snd_trident_pcm_rvol_control_info,
-	get:		snd_trident_pcm_rvol_control_get,
-	put:		snd_trident_pcm_rvol_control_put,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =         "PCM Reverb Playback Volume",
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.info =		snd_trident_pcm_rvol_control_info,
+	.get =		snd_trident_pcm_rvol_control_get,
+	.put =		snd_trident_pcm_rvol_control_put,
 };
 
 /*---------------------------------------------------------------------------
@@ -2800,12 +2800,12 @@ static int snd_trident_pcm_cvol_control_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_trident_pcm_cvol_control __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_MIXER,
-	name:           "PCM Chorus Playback Volume",
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	info:		snd_trident_pcm_cvol_control_info,
-	get:		snd_trident_pcm_cvol_control_get,
-	put:		snd_trident_pcm_cvol_control_put,
+	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name =         "PCM Chorus Playback Volume",
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.info =		snd_trident_pcm_cvol_control_info,
+	.get =		snd_trident_pcm_cvol_control_get,
+	.put =		snd_trident_pcm_cvol_control_put,
 };
 
 static void snd_trident_notify_pcm_change1(snd_card_t * card, snd_kcontrol_t *kctl, int activate)
@@ -3152,7 +3152,7 @@ int __devinit snd_trident_create(snd_card_t * card,
 	snd_trident_voice_t *voice;
 	snd_trident_pcm_mixer_t *tmix;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_trident_dev_free,
+		.dev_free =	snd_trident_dev_free,
 	};
 
 	*rtrident = NULL;
diff --git a/sound/pci/via686.c b/sound/pci/via686.c
index b72cb6752415..47ebcee4df17 100644
--- a/sound/pci/via686.c
+++ b/sound/pci/via686.c
@@ -591,41 +591,41 @@ static snd_pcm_uframes_t snd_via686a_capture_pointer(snd_pcm_substream_t * subst
 
 static snd_pcm_hardware_t snd_via686a_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_PAUSE),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			0,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	128 * 1024,
-	period_bytes_min:	32,
-	period_bytes_max:	128 * 1024,
-	periods_min:		2,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		0,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	128 * 1024,
+	.period_bytes_min =	32,
+	.period_bytes_max =	128 * 1024,
+	.periods_min =		2,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_via686a_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			0,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	128 * 1024,
-	period_bytes_min:	32,
-	period_bytes_max:	128 * 1024,
-	periods_min:		2,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		0,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	128 * 1024,
+	.period_bytes_min =	32,
+	.period_bytes_max =	128 * 1024,
+	.periods_min =		2,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static int snd_via686a_playback_open(snd_pcm_substream_t * substream)
@@ -701,31 +701,31 @@ static int snd_via686a_capture_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_via686a_playback_ops = {
-	open:		snd_via686a_playback_open,
-	close:		snd_via686a_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_via686a_hw_params,
-	hw_free:	snd_via686a_hw_free,
-	prepare:	snd_via686a_playback_prepare,
-	trigger:	snd_via686a_playback_trigger,
-	pointer:	snd_via686a_playback_pointer,
-	copy:           snd_pcm_sgbuf_ops_copy_playback,
-	silence:        snd_pcm_sgbuf_ops_silence,
-	page:           snd_pcm_sgbuf_ops_page,
+	.open =		snd_via686a_playback_open,
+	.close =	snd_via686a_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_via686a_hw_params,
+	.hw_free =	snd_via686a_hw_free,
+	.prepare =	snd_via686a_playback_prepare,
+	.trigger =	snd_via686a_playback_trigger,
+	.pointer =	snd_via686a_playback_pointer,
+	.copy =		snd_pcm_sgbuf_ops_copy_playback,
+	.silence =	snd_pcm_sgbuf_ops_silence,
+	.page =		snd_pcm_sgbuf_ops_page,
 };
 
 static snd_pcm_ops_t snd_via686a_capture_ops = {
-	open:		snd_via686a_capture_open,
-	close:		snd_via686a_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_via686a_hw_params,
-	hw_free:	snd_via686a_hw_free,
-	prepare:	snd_via686a_capture_prepare,
-	trigger:	snd_via686a_capture_trigger,
-	pointer:	snd_via686a_capture_pointer,
-	copy:           snd_pcm_sgbuf_ops_copy_capture,
-	silence:        snd_pcm_sgbuf_ops_silence,
-	page:           snd_pcm_sgbuf_ops_page,
+	.open =		snd_via686a_capture_open,
+	.close =	snd_via686a_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_via686a_hw_params,
+	.hw_free =	snd_via686a_hw_free,
+	.prepare =	snd_via686a_capture_prepare,
+	.trigger =	snd_via686a_capture_trigger,
+	.pointer =	snd_via686a_capture_pointer,
+	.copy =		snd_pcm_sgbuf_ops_copy_capture,
+	.silence =	snd_pcm_sgbuf_ops_silence,
+	.page =		snd_pcm_sgbuf_ops_page,
 };
 
 static void snd_via686a_pcm_free(snd_pcm_t *pcm)
@@ -838,11 +838,11 @@ static int snd_via686a_joystick_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value
 }
 
 static snd_kcontrol_new_t snd_via686a_joystick_control __devinitdata = {
-	name: "Joystick",
-	iface: SNDRV_CTL_ELEM_IFACE_CARD,
-	info: snd_via686a_joystick_info,
-	get: snd_via686a_joystick_get,
-	put: snd_via686a_joystick_put,
+	.name = "Joystick",
+	.iface = SNDRV_CTL_ELEM_IFACE_CARD,
+	.info = snd_via686a_joystick_info,
+	.get = snd_via686a_joystick_get,
+	.put = snd_via686a_joystick_put,
 };
 
 /*
@@ -1008,7 +1008,7 @@ static int __devinit snd_via686a_create(snd_card_t * card,
 	via686a_t *chip;
 	int err;
         static snd_device_ops_t ops = {
-		dev_free:	snd_via686a_dev_free,
+		.dev_free =	snd_via686a_dev_free,
         };
 
 	if ((err = pci_enable_device(pci)) < 0)
@@ -1201,10 +1201,10 @@ static void __devexit snd_via686a_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "VIA 82C686A/B",
-	id_table: snd_via686a_ids,
-	probe: snd_via686a_probe,
-	remove: __devexit_p(snd_via686a_remove),
+	.name = "VIA 82C686A/B",
+	.id_table = snd_via686a_ids,
+	.probe = snd_via686a_probe,
+	.remove = __devexit_p(snd_via686a_remove),
 };
 
 static int __init alsa_card_via686a_init(void)
diff --git a/sound/pci/via8233.c b/sound/pci/via8233.c
index 643434a8544c..6f72ba995aae 100644
--- a/sound/pci/via8233.c
+++ b/sound/pci/via8233.c
@@ -577,41 +577,41 @@ static snd_pcm_uframes_t snd_via8233_capture_pointer(snd_pcm_substream_t * subst
 
 static snd_pcm_hardware_t snd_via8233_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_PAUSE),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			0,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		6,
-	buffer_bytes_max:	128 * 1024,
-	period_bytes_min:	32,
-	period_bytes_max:	128 * 1024,
-	periods_min:		2,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		0,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		6,
+	.buffer_bytes_max =	128 * 1024,
+	.period_bytes_min =	32,
+	.period_bytes_max =	128 * 1024,
+	.periods_min =		2,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_via8233_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_MMAP_VALID),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			0,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	128 * 1024,
-	period_bytes_min:	32,
-	period_bytes_max:	128 * 1024,
-	periods_min:		2,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		0,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	128 * 1024,
+	.period_bytes_min =	32,
+	.period_bytes_max =	128 * 1024,
+	.periods_min =		2,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static unsigned int channels[] = {
@@ -621,9 +621,9 @@ static unsigned int channels[] = {
 #define CHANNELS sizeof(channels) / sizeof(channels[0])
 
 static snd_pcm_hw_constraint_list_t hw_constraints_channels = {
-	count: CHANNELS,
-	list: channels,
-	mask: 0,
+	.count = CHANNELS,
+	.list = channels,
+	.mask = 0,
 };
 
 static int snd_via8233_playback_open(snd_pcm_substream_t * substream)
@@ -698,31 +698,31 @@ static int snd_via8233_capture_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_via8233_playback_ops = {
-	open:		snd_via8233_playback_open,
-	close:		snd_via8233_playback_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_via8233_hw_params,
-	hw_free:	snd_via8233_hw_free,
-	prepare:	snd_via8233_playback_prepare,
-	trigger:	snd_via8233_playback_trigger,
-	pointer:	snd_via8233_playback_pointer,
-	copy:           snd_pcm_sgbuf_ops_copy_playback,
-	silence:        snd_pcm_sgbuf_ops_silence,
-	page:           snd_pcm_sgbuf_ops_page,
+	.open =		snd_via8233_playback_open,
+	.close =	snd_via8233_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_via8233_hw_params,
+	.hw_free =	snd_via8233_hw_free,
+	.prepare =	snd_via8233_playback_prepare,
+	.trigger =	snd_via8233_playback_trigger,
+	.pointer =	snd_via8233_playback_pointer,
+	.copy =		snd_pcm_sgbuf_ops_copy_playback,
+	.silence =	snd_pcm_sgbuf_ops_silence,
+	.page =		snd_pcm_sgbuf_ops_page,
 };
 
 static snd_pcm_ops_t snd_via8233_capture_ops = {
-	open:		snd_via8233_capture_open,
-	close:		snd_via8233_capture_close,
-	ioctl:		snd_pcm_lib_ioctl,
-	hw_params:	snd_via8233_hw_params,
-	hw_free:	snd_via8233_hw_free,
-	prepare:	snd_via8233_capture_prepare,
-	trigger:	snd_via8233_capture_trigger,
-	pointer:	snd_via8233_capture_pointer,
-	copy:           snd_pcm_sgbuf_ops_copy_capture,
-	silence:        snd_pcm_sgbuf_ops_silence,
-	page:           snd_pcm_sgbuf_ops_page,
+	.open =		snd_via8233_capture_open,
+	.close =	snd_via8233_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_via8233_hw_params,
+	.hw_free =	snd_via8233_hw_free,
+	.prepare =	snd_via8233_capture_prepare,
+	.trigger =	snd_via8233_capture_trigger,
+	.pointer =	snd_via8233_capture_pointer,
+	.copy =		snd_pcm_sgbuf_ops_copy_capture,
+	.silence =	snd_pcm_sgbuf_ops_silence,
+	.page =		snd_pcm_sgbuf_ops_page,
 };
 
 static void snd_via8233_pcm_free(snd_pcm_t *pcm)
@@ -871,7 +871,7 @@ static int __devinit snd_via8233_create(snd_card_t * card,
 	via8233_t *chip;
 	int err;
         static snd_device_ops_t ops = {
-		dev_free:	snd_via8233_dev_free,
+		.dev_free =	snd_via8233_dev_free,
         };
 
 	if ((err = pci_enable_device(pci)) < 0)
@@ -991,10 +991,10 @@ static void __devexit snd_via8233_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "VIA 8233",
-	id_table: snd_via8233_ids,
-	probe: snd_via8233_probe,
-	remove: __devexit_p(snd_via8233_remove),
+	.name = "VIA 8233",
+	.id_table = snd_via8233_ids,
+	.probe = snd_via8233_probe,
+	.remove = __devexit_p(snd_via8233_remove),
 };
 
 static int __init alsa_card_via8233_init(void)
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 2deb43aca62f..25aef203cdce 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -279,13 +279,13 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-	name: "Yamaha DS-XG PCI",
-	id_table: snd_ymfpci_ids,
-	probe: snd_card_ymfpci_probe,
-	remove: __devexit_p(snd_card_ymfpci_remove),
+	.name = "Yamaha DS-XG PCI",
+	.id_table = snd_ymfpci_ids,
+	.probe = snd_card_ymfpci_probe,
+	.remove = __devexit_p(snd_card_ymfpci_remove),
 #ifdef CONFIG_PM
-	suspend: snd_card_ymfpci_suspend,
-	resume: snd_card_ymfpci_resume,
+	.suspend = snd_card_ymfpci_suspend,
+	.resume = snd_card_ymfpci_resume,
 #endif	
 };
 
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 88467fdb59fe..93a14092d463 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -787,46 +787,46 @@ static void snd_ymfpci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static snd_pcm_hardware_t snd_ymfpci_playback =
 {
-	info:			(SNDRV_PCM_INFO_MMAP |
+	.info =			(SNDRV_PCM_INFO_MMAP |
 				 SNDRV_PCM_INFO_MMAP_VALID | 
 				 SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_PAUSE |
 				 SNDRV_PCM_INFO_RESUME),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	256 * 1024, /* FIXME: enough? */
-	period_bytes_min:	64,
-	period_bytes_max:	256 * 1024, /* FIXME: enough? */
-	periods_min:		3,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	256 * 1024, /* FIXME: enough? */
+	.period_bytes_min =	64,
+	.period_bytes_max =	256 * 1024, /* FIXME: enough? */
+	.periods_min =		3,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static snd_pcm_hardware_t snd_ymfpci_capture =
 {
-	info:			(SNDRV_PCM_INFO_MMAP |
+	.info =			(SNDRV_PCM_INFO_MMAP |
 				 SNDRV_PCM_INFO_MMAP_VALID |
 				 SNDRV_PCM_INFO_INTERLEAVED |
 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 				 SNDRV_PCM_INFO_PAUSE |
 				 SNDRV_PCM_INFO_RESUME),
-	formats:		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-	rates:			SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-	rate_min:		8000,
-	rate_max:		48000,
-	channels_min:		1,
-	channels_max:		2,
-	buffer_bytes_max:	256 * 1024, /* FIXME: enough? */
-	period_bytes_min:	64,
-	period_bytes_max:	256 * 1024, /* FIXME: enough? */
-	periods_min:		3,
-	periods_max:		1024,
-	fifo_size:		0,
+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+	.rate_min =		8000,
+	.rate_max =		48000,
+	.channels_min =		1,
+	.channels_max =		2,
+	.buffer_bytes_max =	256 * 1024, /* FIXME: enough? */
+	.period_bytes_min =	64,
+	.period_bytes_max =	256 * 1024, /* FIXME: enough? */
+	.periods_min =		3,
+	.periods_max =		1024,
+	.fifo_size =		0,
 };
 
 static void snd_ymfpci_pcm_free_substream(snd_pcm_runtime_t *runtime)
@@ -1052,25 +1052,25 @@ static int snd_ymfpci_capture_close(snd_pcm_substream_t * substream)
 }
 
 static snd_pcm_ops_t snd_ymfpci_playback_ops = {
-	open:			snd_ymfpci_playback_open,
-	close:			snd_ymfpci_playback_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_ymfpci_playback_hw_params,
-	hw_free:		snd_ymfpci_playback_hw_free,
-	prepare:		snd_ymfpci_playback_prepare,
-	trigger:		snd_ymfpci_playback_trigger,
-	pointer:		snd_ymfpci_playback_pointer,
+	.open =			snd_ymfpci_playback_open,
+	.close =		snd_ymfpci_playback_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_ymfpci_playback_hw_params,
+	.hw_free =		snd_ymfpci_playback_hw_free,
+	.prepare =		snd_ymfpci_playback_prepare,
+	.trigger =		snd_ymfpci_playback_trigger,
+	.pointer =		snd_ymfpci_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_ymfpci_capture_rec_ops = {
-	open:			snd_ymfpci_capture_rec_open,
-	close:			snd_ymfpci_capture_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_ymfpci_capture_hw_params,
-	hw_free:		snd_ymfpci_capture_hw_free,
-	prepare:		snd_ymfpci_capture_prepare,
-	trigger:		snd_ymfpci_capture_trigger,
-	pointer:		snd_ymfpci_capture_pointer,
+	.open =			snd_ymfpci_capture_rec_open,
+	.close =		snd_ymfpci_capture_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_ymfpci_capture_hw_params,
+	.hw_free =		snd_ymfpci_capture_hw_free,
+	.prepare =		snd_ymfpci_capture_prepare,
+	.trigger =		snd_ymfpci_capture_trigger,
+	.pointer =		snd_ymfpci_capture_pointer,
 };
 
 static void snd_ymfpci_pcm_free(snd_pcm_t *pcm)
@@ -1108,14 +1108,14 @@ int __devinit snd_ymfpci_pcm(ymfpci_t *chip, int device, snd_pcm_t ** rpcm)
 }
 
 static snd_pcm_ops_t snd_ymfpci_capture_ac97_ops = {
-	open:			snd_ymfpci_capture_ac97_open,
-	close:			snd_ymfpci_capture_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_ymfpci_capture_hw_params,
-	hw_free:		snd_ymfpci_capture_hw_free,
-	prepare:		snd_ymfpci_capture_prepare,
-	trigger:		snd_ymfpci_capture_trigger,
-	pointer:		snd_ymfpci_capture_pointer,
+	.open =			snd_ymfpci_capture_ac97_open,
+	.close =		snd_ymfpci_capture_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_ymfpci_capture_hw_params,
+	.hw_free =		snd_ymfpci_capture_hw_free,
+	.prepare =		snd_ymfpci_capture_prepare,
+	.trigger =		snd_ymfpci_capture_trigger,
+	.pointer =		snd_ymfpci_capture_pointer,
 };
 
 static void snd_ymfpci_pcm2_free(snd_pcm_t *pcm)
@@ -1152,14 +1152,14 @@ int __devinit snd_ymfpci_pcm2(ymfpci_t *chip, int device, snd_pcm_t ** rpcm)
 }
 
 static snd_pcm_ops_t snd_ymfpci_playback_spdif_ops = {
-	open:			snd_ymfpci_playback_spdif_open,
-	close:			snd_ymfpci_playback_spdif_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_ymfpci_playback_hw_params,
-	hw_free:		snd_ymfpci_playback_hw_free,
-	prepare:		snd_ymfpci_playback_prepare,
-	trigger:		snd_ymfpci_playback_trigger,
-	pointer:		snd_ymfpci_playback_pointer,
+	.open =			snd_ymfpci_playback_spdif_open,
+	.close =		snd_ymfpci_playback_spdif_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_ymfpci_playback_hw_params,
+	.hw_free =		snd_ymfpci_playback_hw_free,
+	.prepare =		snd_ymfpci_playback_prepare,
+	.trigger =		snd_ymfpci_playback_trigger,
+	.pointer =		snd_ymfpci_playback_pointer,
 };
 
 static void snd_ymfpci_pcm_spdif_free(snd_pcm_t *pcm)
@@ -1192,14 +1192,14 @@ int __devinit snd_ymfpci_pcm_spdif(ymfpci_t *chip, int device, snd_pcm_t ** rpcm
 }
 
 static snd_pcm_ops_t snd_ymfpci_playback_4ch_ops = {
-	open:			snd_ymfpci_playback_4ch_open,
-	close:			snd_ymfpci_playback_4ch_close,
-	ioctl:			snd_pcm_lib_ioctl,
-	hw_params:		snd_ymfpci_playback_hw_params,
-	hw_free:		snd_ymfpci_playback_hw_free,
-	prepare:		snd_ymfpci_playback_prepare,
-	trigger:		snd_ymfpci_playback_trigger,
-	pointer:		snd_ymfpci_playback_pointer,
+	.open =			snd_ymfpci_playback_4ch_open,
+	.close =		snd_ymfpci_playback_4ch_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_ymfpci_playback_hw_params,
+	.hw_free =		snd_ymfpci_playback_hw_free,
+	.prepare =		snd_ymfpci_playback_prepare,
+	.trigger =		snd_ymfpci_playback_trigger,
+	.pointer =		snd_ymfpci_playback_pointer,
 };
 
 static void snd_ymfpci_pcm_4ch_free(snd_pcm_t *pcm)
@@ -1272,11 +1272,11 @@ static int snd_ymfpci_spdif_default_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_ymfpci_spdif_default __devinitdata =
 {
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-	info:		snd_ymfpci_spdif_default_info,
-	get:		snd_ymfpci_spdif_default_get,
-	put:		snd_ymfpci_spdif_default_put
+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+	.info =		snd_ymfpci_spdif_default_info,
+	.get =		snd_ymfpci_spdif_default_get,
+	.put =		snd_ymfpci_spdif_default_put
 };
 
 static int snd_ymfpci_spdif_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1301,11 +1301,11 @@ static int snd_ymfpci_spdif_mask_get(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_ymfpci_spdif_mask __devinitdata =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READ,
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
-	info:		snd_ymfpci_spdif_mask_info,
-	get:		snd_ymfpci_spdif_mask_get,
+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
+	.iface =		SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =           SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+	.info =		snd_ymfpci_spdif_mask_info,
+	.get =		snd_ymfpci_spdif_mask_get,
 };
 
 static int snd_ymfpci_spdif_stream_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1349,12 +1349,12 @@ static int snd_ymfpci_spdif_stream_put(snd_kcontrol_t * kcontrol,
 
 static snd_kcontrol_new_t snd_ymfpci_spdif_stream __devinitdata =
 {
-	access:		SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-	iface:		SNDRV_CTL_ELEM_IFACE_PCM,
-	name:           SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
-	info:		snd_ymfpci_spdif_stream_info,
-	get:		snd_ymfpci_spdif_stream_get,
-	put:		snd_ymfpci_spdif_stream_put
+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+	.iface =		SNDRV_CTL_ELEM_IFACE_PCM,
+	.name =           SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
+	.info =		snd_ymfpci_spdif_stream_info,
+	.get =		snd_ymfpci_spdif_stream_get,
+	.put =		snd_ymfpci_spdif_stream_put
 };
 
 /*
@@ -1362,10 +1362,10 @@ static snd_kcontrol_new_t snd_ymfpci_spdif_stream __devinitdata =
  */
 
 #define YMFPCI_SINGLE(xname, xindex, reg) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_ymfpci_info_single, \
-  get: snd_ymfpci_get_single, put: snd_ymfpci_put_single, \
-  private_value: reg }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_ymfpci_info_single, \
+  .get = snd_ymfpci_get_single, .put = snd_ymfpci_put_single, \
+  .private_value = reg }
 
 static int snd_ymfpci_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1428,10 +1428,10 @@ static int snd_ymfpci_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 }
 
 #define YMFPCI_DOUBLE(xname, xindex, reg) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
-  info: snd_ymfpci_info_double, \
-  get: snd_ymfpci_get_double, put: snd_ymfpci_put_double, \
-  private_value: reg }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_ymfpci_info_double, \
+  .get = snd_ymfpci_get_double, .put = snd_ymfpci_put_double, \
+  .private_value = reg }
 
 static int snd_ymfpci_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -1545,11 +1545,11 @@ YMFPCI_DOUBLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,VOLUME), 1, YDSXGR_SPDIFLOOPVOL),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), 0, YDSXGR_SPDIFOUTCTRL),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, YDSXGR_SPDIFINCTRL),
 {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "4ch Duplication",
-	info: snd_ymfpci_info_dup4ch,
-	get: snd_ymfpci_get_dup4ch,
-	put: snd_ymfpci_put_dup4ch,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "4ch Duplication",
+	.info = snd_ymfpci_info_dup4ch,
+	.get = snd_ymfpci_get_dup4ch,
+	.put = snd_ymfpci_put_dup4ch,
 },
 };
 
@@ -1626,12 +1626,12 @@ static int snd_ymfpci_gpio_sw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 }
 
 static snd_kcontrol_new_t snd_ymfpci_rear_shared __devinitdata = {
-	name: "Shared Rear/Line-In Switch",
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	info: snd_ymfpci_gpio_sw_info,
-	get: snd_ymfpci_gpio_sw_get,
-	put: snd_ymfpci_gpio_sw_put,
-	private_value: 2,
+	.name = "Shared Rear/Line-In Switch",
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.info = snd_ymfpci_gpio_sw_info,
+	.get = snd_ymfpci_gpio_sw_get,
+	.put = snd_ymfpci_gpio_sw_put,
+	.private_value = 2,
 };
 
 
@@ -1778,19 +1778,19 @@ static int snd_ymfpci_joystick_addr_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_v
 }
 
 static snd_kcontrol_new_t snd_ymfpci_control_joystick __devinitdata = {
-	name: "Joystick",
-	iface: SNDRV_CTL_ELEM_IFACE_CARD,
-	info: snd_ymfpci_joystick_info,
-	get: snd_ymfpci_joystick_get,
-	put: snd_ymfpci_joystick_put,
+	.name = "Joystick",
+	.iface = SNDRV_CTL_ELEM_IFACE_CARD,
+	.info = snd_ymfpci_joystick_info,
+	.get = snd_ymfpci_joystick_get,
+	.put = snd_ymfpci_joystick_put,
 };
 
 static snd_kcontrol_new_t snd_ymfpci_control_joystick_addr __devinitdata = {
-	name: "Joystick Address",
-	iface: SNDRV_CTL_ELEM_IFACE_CARD,
-	info: snd_ymfpci_joystick_addr_info,
-	get: snd_ymfpci_joystick_addr_get,
-	put: snd_ymfpci_joystick_addr_put,
+	.name = "Joystick Address",
+	.iface = SNDRV_CTL_ELEM_IFACE_CARD,
+	.info = snd_ymfpci_joystick_addr_info,
+	.get = snd_ymfpci_joystick_addr_get,
+	.put = snd_ymfpci_joystick_addr_put,
 };
 
 int __devinit snd_ymfpci_joystick(ymfpci_t *chip)
@@ -2199,7 +2199,7 @@ int __devinit snd_ymfpci_create(snd_card_t * card,
 	ymfpci_t *chip;
 	int err;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_ymfpci_dev_free,
+		.dev_free =	snd_ymfpci_dev_free,
 	};
 	
 	*rchip = NULL;
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index ef7ca42e05e5..3277af881c67 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -164,11 +164,11 @@ static int snd_pmac_awacs_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_valu
 
 
 #define AWACS_VOLUME(xname, xreg, xshift) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: 0, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0, \
   .info = snd_pmac_awacs_info_volume, \
   .get = snd_pmac_awacs_get_volume, \
   .put = snd_pmac_awacs_put_volume, \
-  private_value: (xreg) | ((xshift) << 8) }
+  .private_value = (xreg) | ((xshift) << 8) }
 
 /*
  * mute master/ogain for AWACS: mono
@@ -213,11 +213,11 @@ static int snd_pmac_awacs_put_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_valu
 }
 
 #define AWACS_SWITCH(xname, xreg, xshift, xinvert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: 0, \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0, \
   .info = snd_pmac_boolean_mono_info, \
   .get = snd_pmac_awacs_get_switch, \
   .put = snd_pmac_awacs_put_switch, \
-  private_value: (xreg) | ((xshift) << 8) | ((xinvert) << 16) }
+  .private_value = (xreg) | ((xshift) << 8) | ((xinvert) << 16) }
 
 
 #ifdef PMAC_AMP_AVAIL
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c
index 63c9f488eed8..737531322d52 100644
--- a/sound/ppc/burgundy.c
+++ b/sound/ppc/burgundy.c
@@ -195,11 +195,10 @@ static int snd_pmac_burgundy_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_v
 }
 
 #define BURGUNDY_VOLUME(xname, xindex, addr, shift) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex,\
-  .info = snd_pmac_burgundy_info_volume,\
-  .get = snd_pmac_burgundy_get_volume,\
-  .put = snd_pmac_burgundy_put_volume,\
-  private_value: ((ADDR2BASE(addr) & 0xff) | ((shift) << 8)) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
+  .info = snd_pmac_burgundy_info_volume,\ .get = snd_pmac_burgundy_get_volume,\
+  .put = snd_pmac_burgundy_put_volume,\ .private_value = ((ADDR2BASE(addr) &
+  0xff) | ((shift) << 8)) }
 
 /* lineout/speaker */
 
@@ -244,11 +243,11 @@ static int snd_pmac_burgundy_put_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_el
 }
 
 #define BURGUNDY_OUTPUT_SWITCH(xname, xindex, lmask, rmask, stereo) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex,\
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
   .info = snd_pmac_burgundy_info_switch_out,\
   .get = snd_pmac_burgundy_get_switch_out,\
   .put = snd_pmac_burgundy_put_switch_out,\
-  private_value: ((lmask) | ((rmask) << 8) | ((stereo) << 24)) }
+  .private_value = ((lmask) | ((rmask) << 8) | ((stereo) << 24)) }
 
 /* line/speaker output volume */
 static int snd_pmac_burgundy_info_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
@@ -294,11 +293,11 @@ static int snd_pmac_burgundy_put_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_el
 }
 
 #define BURGUNDY_OUTPUT_VOLUME(xname, xindex, addr, stereo) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex,\
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
   .info = snd_pmac_burgundy_info_volume_out,\
   .get = snd_pmac_burgundy_get_volume_out,\
   .put = snd_pmac_burgundy_put_volume_out,\
-  private_value: (ADDR2BASE(addr) | ((stereo) << 24)) }
+  .private_value = (ADDR2BASE(addr) | ((stereo) << 24)) }
 
 static snd_kcontrol_new_t snd_pmac_burgundy_mixers[] __initdata = {
 	BURGUNDY_VOLUME("Master Playback Volume", 0, MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8),
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c
index da144205b490..0188139a2c20 100644
--- a/sound/ppc/daca.c
+++ b/sound/ppc/daca.c
@@ -200,19 +200,19 @@ static snd_kcontrol_new_t daca_mixers[] = {
 	  .name = "Deemphasis Switch",
 	  .info = daca_info_deemphasis,
 	  .get = daca_get_deemphasis,
-	  put: daca_put_deemphasis
+	  .put = daca_put_deemphasis
 	},
 	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
 	  .name = "Master Playback Volume",
 	  .info = daca_info_volume,
 	  .get = daca_get_volume,
-	  put: daca_put_volume
+	  .put = daca_put_volume
 	},
 	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
 	  .name = "Power Amplifier Switch",
 	  .info = daca_info_amp,
 	  .get = daca_get_amp,
-	  put: daca_put_amp
+	  .put = daca_put_amp
 	},
 };
 
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 4af0b5ac73d1..e53e6d72c8af 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -437,40 +437,40 @@ static void snd_pmac_pcm_update(pmac_t *chip, pmac_stream_t *rec)
 
 static snd_pcm_hardware_t snd_pmac_playback =
 {
-	info:		(SNDRV_PCM_INFO_INTERLEAVED |
-			 SNDRV_PCM_INFO_MMAP |
-			 SNDRV_PCM_INFO_MMAP_VALID |
-			 SNDRV_PCM_INFO_RESUME),
-	.formats	= SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE,
-	.rates		= SNDRV_PCM_RATE_8000_44100,
-	.rate_min	= 7350,
-	.rate_max	= 44100,
-	.channels_min	= 2,
-	.channels_max	= 2,
-	.buffer_bytes_max	= 32768,
-	.period_bytes_min	= 256,
-	.period_bytes_max	= 16384,
-	.periods_min		= 1,
-	.periods_max		= PMAC_MAX_FRAGS,
+	.info =			(SNDRV_PCM_INFO_INTERLEAVED |
+				 SNDRV_PCM_INFO_MMAP |
+				 SNDRV_PCM_INFO_MMAP_VALID |
+				 SNDRV_PCM_INFO_RESUME),
+	.formats =		SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_8000_44100,
+	.rate_min =		7350,
+	.rate_max =		44100,
+	.channels_min =		2,
+	.channels_max =		2,
+	.buffer_bytes_max =	32768,
+	.period_bytes_min =	256,
+	.period_bytes_max =	16384,
+	.periods_min =		1,
+	.periods_max =		PMAC_MAX_FRAGS,
 };
 
 static snd_pcm_hardware_t snd_pmac_capture =
 {
-	info:		(SNDRV_PCM_INFO_INTERLEAVED |
-			 SNDRV_PCM_INFO_MMAP |
-			 SNDRV_PCM_INFO_MMAP_VALID |
-			 SNDRV_PCM_INFO_RESUME),
-	.formats	= SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE,
-	.rates		= SNDRV_PCM_RATE_8000_44100,
-	.rate_min	= 7350,
-	.rate_max	= 44100,
-	.channels_min	= 2,
-	.channels_max	= 2,
-	.buffer_bytes_max	= 32768,
-	.period_bytes_min	= 256,
-	.period_bytes_max	= 16384,
-	.periods_min		= 1,
-	.periods_max		= PMAC_MAX_FRAGS,
+	.info =			(SNDRV_PCM_INFO_INTERLEAVED |
+				 SNDRV_PCM_INFO_MMAP |
+				 SNDRV_PCM_INFO_MMAP_VALID |
+				 SNDRV_PCM_INFO_RESUME),
+	.formats =		SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE,
+	.rates =		SNDRV_PCM_RATE_8000_44100,
+	.rate_min =		7350,
+	.rate_max =		44100,
+	.channels_min =		2,
+	.channels_max =		2,
+	.buffer_bytes_max =	32768,
+	.period_bytes_min =	256,
+	.period_bytes_max =	16384,
+	.periods_min =		1,
+	.periods_max =		PMAC_MAX_FRAGS,
 };
 
 
@@ -627,25 +627,25 @@ static int snd_pmac_capture_close(snd_pcm_substream_t *subs)
  */
 
 static snd_pcm_ops_t snd_pmac_playback_ops = {
-	.open		= snd_pmac_playback_open,
-	.close		= snd_pmac_playback_close,
-	.ioctl		= snd_pcm_lib_ioctl,
-	.hw_params	= snd_pmac_pcm_hw_params,
-	.hw_free	= snd_pmac_pcm_hw_free,
-	.prepare	= snd_pmac_playback_prepare,
-	.trigger	= snd_pmac_playback_trigger,
-	.pointer	= snd_pmac_playback_pointer,
+	.open =		snd_pmac_playback_open,
+	.close =	snd_pmac_playback_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_pmac_pcm_hw_params,
+	.hw_free =	snd_pmac_pcm_hw_free,
+	.prepare =	snd_pmac_playback_prepare,
+	.trigger =	snd_pmac_playback_trigger,
+	.pointer =	snd_pmac_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_pmac_capture_ops = {
-	.open		= snd_pmac_capture_open,
-	.close		= snd_pmac_capture_close,
-	.ioctl		= snd_pcm_lib_ioctl,
-	.hw_params	= snd_pmac_pcm_hw_params,
-	.hw_free	= snd_pmac_pcm_hw_free,
-	.prepare	= snd_pmac_capture_prepare,
-	.trigger	= snd_pmac_capture_trigger,
-	.pointer	= snd_pmac_capture_pointer,
+	.open =		snd_pmac_capture_open,
+	.close =	snd_pmac_capture_close,
+	.ioctl =	snd_pcm_lib_ioctl,
+	.hw_params =	snd_pmac_pcm_hw_params,
+	.hw_free =	snd_pmac_pcm_hw_free,
+	.prepare =	snd_pmac_capture_prepare,
+	.trigger =	snd_pmac_capture_trigger,
+	.pointer =	snd_pmac_capture_pointer,
 };
 
 static void pmac_pcm_free(snd_pcm_t *pcm)
@@ -1305,7 +1305,7 @@ int __init snd_pmac_new(snd_card_t *card, pmac_t **chip_return)
 	struct device_node *np;
 	int i, err;
 	static snd_device_ops_t ops = {
-		.dev_free	= snd_pmac_dev_free,
+		.dev_free =	snd_pmac_dev_free,
 	};
 
 	snd_runtime_check(chip_return, return -EINVAL);
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 2db0930eea7c..42659a936c1c 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -494,13 +494,13 @@ static snd_kcontrol_new_t tumbler_mixers[] __initdata = {
 	  .name = "Master Playback Volume",
 	  .info = tumbler_info_master_volume,
 	  .get = tumbler_get_master_volume,
-	  put: tumbler_put_master_volume
+	  .put = tumbler_put_master_volume
 	},
 	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
 	  .name = "Master Playback Switch",
 	  .info = snd_pmac_boolean_stereo_info,
 	  .get = tumbler_get_master_switch,
-	  put: tumbler_put_master_switch
+	  .put = tumbler_put_master_switch
 	},
 	DEFINE_MONO("Tone Control - Bass", bass),
 	DEFINE_MONO("Tone Control - Treble", treble),
@@ -510,13 +510,13 @@ static snd_kcontrol_new_t tumbler_mixers[] __initdata = {
 	  .name = "DRC Switch",
 	  .info = snd_pmac_boolean_mono_info,
 	  .get = tumbler_get_drc_switch,
-	  put: tumbler_put_drc_switch
+	  .put = tumbler_put_drc_switch
 	},
 	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
 	  .name = "DRC Range",
 	  .info = tumbler_info_drc_value,
 	  .get = tumbler_get_drc_value,
-	  put: tumbler_put_drc_value
+	  .put = tumbler_put_drc_value
 	},
 };
 
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 31789555b815..72d7b3e0cad0 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -1840,7 +1840,7 @@ static int snd_usb_audio_create(snd_card_t *card, struct usb_device *dev, snd_us
 	snd_usb_audio_t *chip;
 	int err, len;
 	static snd_device_ops_t ops = {
-		dev_free:	snd_usb_audio_dev_free,
+		.dev_free =	snd_usb_audio_dev_free,
 	};
 	
 	*rchip = NULL;
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 6a237df36b27..b013b209523f 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -60,10 +60,13 @@ MODULE_DEVICES("{{Generic,USB MIDI},"
 		"{Roland/EDIROL,SC-8820},"
 		"{Roland/EDIROL,SC-8850},"
 		"{Roland/EDIROL,SC-D70},"
+		"{Roland/EDIROL,SD-20},"
+		"{Roland/EDIROL,SD-80},"
 		"{Roland/EDIROL,SD-90},"
 		"{Roland/EDIROL,SK-500},"
 		"{Roland/EDIROL,U-8},"
 		"{Roland/EDIROL,UA-100(G)},"
+		"{Roland/EDIROL,UA-700},"
 		"{Roland/EDIROL,UM-1(S)},"
 		"{Roland/EDIROL,UM-2(E)},"
 		"{Roland/EDIROL,UM-4},"
@@ -1304,6 +1307,21 @@ static usbmidi_device_info_t snd_usbmidi_roland_um550_info = {
 	.ifnum = 0,
 	.endpoints = {{ -1, 0x003f, 0x003f }}
 };
+static usbmidi_device_info_t snd_usbmidi_roland_sd20_info = {
+	.vendor = "EDIROL", .product = "SD-20",
+	.ifnum = 0,
+	.endpoints = {{ -1, 0x0003, 0x0007 }}
+};
+static usbmidi_device_info_t snd_usbmidi_roland_sd80_info = {
+	.vendor = "EDIROL", .product = "SD-80",
+	.ifnum = 0,
+	.endpoints = {{ -1, 0x000f, 0x000f }}
+};
+static usbmidi_device_info_t snd_usbmidi_roland_ua700_info = {
+	.vendor = "EDIROL", .product = "UA-700",
+	.ifnum = 3,
+	.endpoints = {{ -1, 0x0003, 0x0003 }}
+};
 
 #define USBMIDI_NONCOMPLIANT_DEVICE(vid, pid, name) \
 		USB_DEVICE(vid, pid), \
@@ -1329,6 +1347,9 @@ static usb_device_id_t snd_usbmidi_usb_id_table[] = {
 	{ USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0014, roland_um880) },
 	{ USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0016, roland_sd90) },
 	{ USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0023, roland_um550) },
+	{ USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0027, roland_sd20) },
+	{ USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0029, roland_sd80) },
+	{ USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x002b, roland_ua700) },
 	{ /* terminator */ }
 };
 
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index e306b20ee021..96b0d5f4ca0b 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -572,11 +572,11 @@ static int mixer_ctl_feature_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 }
 
 static snd_kcontrol_new_t usb_feature_unit_ctl = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "", /* will be filled later manually */
-	info: mixer_ctl_feature_info,
-	get: mixer_ctl_feature_get,
-	put: mixer_ctl_feature_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "", /* will be filled later manually */
+	.info = mixer_ctl_feature_info,
+	.get = mixer_ctl_feature_get,
+	.put = mixer_ctl_feature_put,
 };
 
 
@@ -865,11 +865,11 @@ static int mixer_ctl_procunit_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 
 /* alsa control interface for processing/extension unit */
 static snd_kcontrol_new_t mixer_procunit_ctl = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "", /* will be filled later */
-	info: mixer_ctl_feature_info,
-	get: mixer_ctl_procunit_get,
-	put: mixer_ctl_procunit_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "", /* will be filled later */
+	.info = mixer_ctl_feature_info,
+	.get = mixer_ctl_procunit_get,
+	.put = mixer_ctl_procunit_put,
 };
 
 
@@ -1095,11 +1095,11 @@ static int mixer_ctl_selector_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 
 /* alsa control interface for selector unit */
 static snd_kcontrol_new_t mixer_selectunit_ctl = {
-	iface: SNDRV_CTL_ELEM_IFACE_MIXER,
-	name: "", /* will be filled later */
-	info: mixer_ctl_selector_info,
-	get: mixer_ctl_selector_get,
-	put: mixer_ctl_selector_put,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+	.name = "", /* will be filled later */
+	.info = mixer_ctl_selector_info,
+	.get = mixer_ctl_selector_get,
+	.put = mixer_ctl_selector_put,
 };