[PATCH] last batch of audio C99

diff --git a/sound/oss/pas2_midi.c b/sound/oss/pas2_midi.c
index 6c4681b79365cf03be05bdd4aa3065733d0ca7fd..3438db5bf652e100f7b22b745b462dcf535869c1 100644 (file)
--- a/sound/oss/pas2_midi.c
+++ b/sound/oss/pas2_midi.c
@@ -194,17 +194,17 @@ static int pas_buffer_status(int dev)
 
 static struct midi_operations pas_midi_operations =
 {
-       owner:          THIS_MODULE,
-       info:           {"Pro Audio Spectrum", 0, 0, SNDCARD_PAS},
-       converter:      &std_midi_synth,
-       in_info:        {0},
-       open:           pas_midi_open,
-       close:          pas_midi_close,
-       outputc:        pas_midi_out,
-       start_read:     pas_midi_start_read,
-       end_read:       pas_midi_end_read,
-       kick:           pas_midi_kick,
-       buffer_status:  pas_buffer_status,
+       .owner          = THIS_MODULE,
+       .info           = {"Pro Audio Spectrum", 0, 0, SNDCARD_PAS},
+       .converter      = &std_midi_synth,
+       .in_info        = {0},
+       .open           = pas_midi_open,
+       .close          = pas_midi_close,
+       .outputc        = pas_midi_out,
+       .start_read     = pas_midi_start_read,
+       .end_read       = pas_midi_end_read,
+       .kick           = pas_midi_kick,
+       .buffer_status  = pas_buffer_status,
 };
 
 void __init pas_midi_init(void)

diff --git a/sound/oss/pas2_mixer.c b/sound/oss/pas2_mixer.c
index 90cfeb17aee8c07b9625ce7a77a09b79378cbde8..9346108506b42883b3278b4f6ac87ad37a196618 100644 (file)
--- a/sound/oss/pas2_mixer.c
+++ b/sound/oss/pas2_mixer.c
@@ -311,10 +311,10 @@ static int pas_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
 
 static struct mixer_operations pas_mixer_operations =
 {
-       owner:  THIS_MODULE,
-       id:     "PAS16",
-       name:   "Pro Audio Spectrum 16",
-       ioctl:  pas_mixer_ioctl
+       .owner  = THIS_MODULE,
+       .id     = "PAS16",
+       .name   = "Pro Audio Spectrum 16",
+       .ioctl  = pas_mixer_ioctl
 };
 
 int __init

diff --git a/sound/oss/pas2_pcm.c b/sound/oss/pas2_pcm.c
index dc623178802e20e0dcbb8dfc188e6a9a3f533c7b..b8b7893bcf24a3b2ccc5b9105b0231a6d50b3c73 100644 (file)
--- a/sound/oss/pas2_pcm.c
+++ b/sound/oss/pas2_pcm.c
@@ -372,16 +372,16 @@ static int pas_audio_prepare_for_output(int dev, int bsize, int bcount)
 
 static struct audio_driver pas_audio_driver =
 {
-       owner:          THIS_MODULE,
-       open:           pas_audio_open,
-       close:          pas_audio_close,
-       output_block:   pas_audio_output_block,
-       start_input:    pas_audio_start_input,
-       ioctl:          pas_audio_ioctl,
-       prepare_for_input:      pas_audio_prepare_for_input,
-       prepare_for_output:     pas_audio_prepare_for_output,
-       halt_io:                pas_audio_reset,
-       trigger:        pas_audio_trigger
+       .owner                  = THIS_MODULE,
+       .open                   = pas_audio_open,
+       .close                  = pas_audio_close,
+       .output_block           = pas_audio_output_block,
+       .start_input            = pas_audio_start_input,
+       .ioctl                  = pas_audio_ioctl,
+       .prepare_for_input      = pas_audio_prepare_for_input,
+       .prepare_for_output     = pas_audio_prepare_for_output,
+       .halt_io                = pas_audio_reset,
+       .trigger                = pas_audio_trigger
 };
 
 void __init pas_pcm_init(struct address_info *hw_config)

diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 3f33ca7bd18a494228fbaa0bdac9131d98120438..1be0232413e3d42ecc726985d46b37cbac4a9bf5 100644 (file)
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -601,10 +601,10 @@ static int pss_mixer_ioctl (int dev, unsigned int cmd, caddr_t arg)
 
 static struct mixer_operations pss_mixer_operations =
 {
-       owner:  THIS_MODULE,
-       id:     "SOUNDPORT",
-       name:   "PSS-AD1848",
-       ioctl:  pss_mixer_ioctl
+       .owner  = THIS_MODULE,
+       .id     = "SOUNDPORT",
+       .name   = "PSS-AD1848",
+       .ioctl  = pss_mixer_ioctl
 };
 
 void disable_all_emulations(void)

diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
index ff2d506fceb0c565f1a05dcfd1544983f3ab7c3f..f51e5860c029b98aa0ecf6a0c14e4561ebbcc581 100644 (file)
--- a/sound/oss/sb_audio.c
+++ b/sound/oss/sb_audio.c
@@ -927,100 +927,100 @@ sb16_audio_mmap(int dev)
 
 static struct audio_driver sb1_audio_driver =  /* SB1.x */
 {
-       owner:          THIS_MODULE,
-       open:           sb_audio_open,
-       close:          sb_audio_close,
-       output_block:   sb_set_output_parms,
-       start_input:    sb_set_input_parms,
-       prepare_for_input:      sb1_audio_prepare_for_input,
-       prepare_for_output:     sb1_audio_prepare_for_output,
-       halt_io:        sb1_audio_halt_xfer,
-       trigger:        sb1_audio_trigger,
-       set_speed:      sb1_audio_set_speed,
-       set_bits:       sb1_audio_set_bits,
-       set_channels:   sb1_audio_set_channels
+       .owner                  = THIS_MODULE,
+       .open                   = sb_audio_open,
+       .close                  = sb_audio_close,
+       .output_block           = sb_set_output_parms,
+       .start_input            = sb_set_input_parms,
+       .prepare_for_input      = sb1_audio_prepare_for_input,
+       .prepare_for_output     = sb1_audio_prepare_for_output,
+       .halt_io                = sb1_audio_halt_xfer,
+       .trigger                = sb1_audio_trigger,
+       .set_speed              = sb1_audio_set_speed,
+       .set_bits               = sb1_audio_set_bits,
+       .set_channels           = sb1_audio_set_channels
 };
 
 static struct audio_driver sb20_audio_driver = /* SB2.0 */
 {
-       owner:          THIS_MODULE,
-       open:           sb_audio_open,
-       close:          sb_audio_close,
-       output_block:   sb_set_output_parms,
-       start_input:    sb_set_input_parms,
-       prepare_for_input:      sb1_audio_prepare_for_input,
-       prepare_for_output:     sb1_audio_prepare_for_output,
-       halt_io:        sb1_audio_halt_xfer,
-       trigger:        sb20_audio_trigger,
-       set_speed:      sb1_audio_set_speed,
-       set_bits:       sb1_audio_set_bits,
-       set_channels:   sb1_audio_set_channels
+       .owner                  = THIS_MODULE,
+       .open                   = sb_audio_open,
+       .close                  = sb_audio_close,
+       .output_block           = sb_set_output_parms,
+       .start_input            = sb_set_input_parms,
+       .prepare_for_input      = sb1_audio_prepare_for_input,
+       .prepare_for_output     = sb1_audio_prepare_for_output,
+       .halt_io                = sb1_audio_halt_xfer,
+       .trigger                = sb20_audio_trigger,
+       .set_speed              = sb1_audio_set_speed,
+       .set_bits               = sb1_audio_set_bits,
+       .set_channels           = sb1_audio_set_channels
 };
 
 static struct audio_driver sb201_audio_driver =                /* SB2.01 */
 {
-       owner:          THIS_MODULE,
-       open:           sb_audio_open,
-       close:          sb_audio_close,
-       output_block:   sb_set_output_parms,
-       start_input:    sb_set_input_parms,
-       prepare_for_input:      sb1_audio_prepare_for_input,
-       prepare_for_output:     sb1_audio_prepare_for_output,
-       halt_io:        sb1_audio_halt_xfer,
-       trigger:        sb20_audio_trigger,
-       set_speed:      sb201_audio_set_speed,
-       set_bits:       sb1_audio_set_bits,
-       set_channels:   sb1_audio_set_channels
+       .owner                  = THIS_MODULE,
+       .open                   = sb_audio_open,
+       .close                  = sb_audio_close,
+       .output_block           = sb_set_output_parms,
+       .start_input            = sb_set_input_parms,
+       .prepare_for_input      = sb1_audio_prepare_for_input,
+       .prepare_for_output     = sb1_audio_prepare_for_output,
+       .halt_io                = sb1_audio_halt_xfer,
+       .trigger                = sb20_audio_trigger,
+       .set_speed              = sb201_audio_set_speed,
+       .set_bits               = sb1_audio_set_bits,
+       .set_channels           = sb1_audio_set_channels
 };
 
 static struct audio_driver sbpro_audio_driver =                /* SB Pro */
 {
-       owner:          THIS_MODULE,
-       open:           sb_audio_open,
-       close:          sb_audio_close,
-       output_block:   sb_set_output_parms,
-       start_input:    sb_set_input_parms,
-       prepare_for_input:      sbpro_audio_prepare_for_input,
-       prepare_for_output:     sbpro_audio_prepare_for_output,
-       halt_io:        sb1_audio_halt_xfer,
-       trigger:        sb20_audio_trigger,
-       set_speed:      sbpro_audio_set_speed,
-       set_bits:       sb1_audio_set_bits,
-       set_channels:   sbpro_audio_set_channels
+       .owner                  = THIS_MODULE,
+       .open                   = sb_audio_open,
+       .close                  = sb_audio_close,
+       .output_block           = sb_set_output_parms,
+       .start_input            = sb_set_input_parms,
+       .prepare_for_input      = sbpro_audio_prepare_for_input,
+       .prepare_for_output     = sbpro_audio_prepare_for_output,
+       .halt_io                = sb1_audio_halt_xfer,
+       .trigger                = sb20_audio_trigger,
+       .set_speed              = sbpro_audio_set_speed,
+       .set_bits               = sb1_audio_set_bits,
+       .set_channels           = sbpro_audio_set_channels
 };
 
 static struct audio_driver jazz16_audio_driver =       /* Jazz16 and SM Wave */
 {
-       owner:          THIS_MODULE,
-       open:           sb_audio_open,
-       close:          sb_audio_close,
-       output_block:   sb_set_output_parms,
-       start_input:    sb_set_input_parms,
-       prepare_for_input:      sbpro_audio_prepare_for_input,
-       prepare_for_output:     sbpro_audio_prepare_for_output,
-       halt_io:        sb1_audio_halt_xfer,
-       trigger:        sb20_audio_trigger,
-       set_speed:      jazz16_audio_set_speed,
-       set_bits:       sb16_audio_set_bits,
-       set_channels:   sbpro_audio_set_channels
+       .owner                  = THIS_MODULE,
+       .open                   = sb_audio_open,
+       .close                  = sb_audio_close,
+       .output_block           = sb_set_output_parms,
+       .start_input            = sb_set_input_parms,
+       .prepare_for_input      = sbpro_audio_prepare_for_input,
+       .prepare_for_output     = sbpro_audio_prepare_for_output,
+       .halt_io                = sb1_audio_halt_xfer,
+       .trigger                = sb20_audio_trigger,
+       .set_speed              = jazz16_audio_set_speed,
+       .set_bits               = sb16_audio_set_bits,
+       .set_channels           = sbpro_audio_set_channels
 };
 
 static struct audio_driver sb16_audio_driver = /* SB16 */
 {
-       owner:          THIS_MODULE,
-       open:           sb_audio_open,
-       close:          sb_audio_close,
-       output_block:   sb_set_output_parms,
-       start_input:    sb_set_input_parms,
-       prepare_for_input:      sb16_audio_prepare_for_input,
-       prepare_for_output:     sb16_audio_prepare_for_output,
-       halt_io:        sb1_audio_halt_xfer,
-       copy_user:      sb16_copy_from_user,
-       trigger:        sb16_audio_trigger,
-       set_speed:      sb16_audio_set_speed,
-       set_bits:       sb16_audio_set_bits,
-       set_channels:   sbpro_audio_set_channels,
-       mmap:           sb16_audio_mmap
+       .owner                  = THIS_MODULE,
+       .open                   = sb_audio_open,
+       .close                  = sb_audio_close,
+       .output_block           = sb_set_output_parms,
+       .start_input            = sb_set_input_parms,
+       .prepare_for_input      = sb16_audio_prepare_for_input,
+       .prepare_for_output     = sb16_audio_prepare_for_output,
+       .halt_io                = sb1_audio_halt_xfer,
+       .copy_user              = sb16_copy_from_user,
+       .trigger                = sb16_audio_trigger,
+       .set_speed              = sb16_audio_set_speed,
+       .set_bits               = sb16_audio_set_bits,
+       .set_channels           = sbpro_audio_set_channels,
+       .mmap                   = sb16_audio_mmap
 };
 
 void sb_audio_init(sb_devc * devc, char *name, struct module *owner)

diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index d5c8034b50a3b90a0f56ca4d1f92a9067b1ecda7..b6fc66e456c7a92be1ee54006709c1cf25fd5b11 100644 (file)
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -718,18 +718,18 @@ static short ess_audio_set_channels(int dev, short channels)
 
 static struct audio_driver ess_audio_driver =   /* ESS ES688/1688 */
 {
-       owner:                  THIS_MODULE,
-       open:                   sb_audio_open,
-       close:                  sb_audio_close,
-       output_block:   ess_set_output_parms,
-       start_input:    ess_set_input_parms,
-       prepare_for_input:      ess_audio_prepare_for_input,
-       prepare_for_output:     ess_audio_prepare_for_output,
-       halt_io:                ess_audio_halt_xfer,
-       trigger:                ess_audio_trigger,
-       set_speed:              ess_audio_set_speed,
-       set_bits:               ess_audio_set_bits,
-       set_channels:   ess_audio_set_channels
+       .owner                  = THIS_MODULE,
+       .open                   = sb_audio_open,
+       .close                  = sb_audio_close,
+       .output_block           = ess_set_output_parms,
+       .start_input            = ess_set_input_parms,
+       .prepare_for_input      = ess_audio_prepare_for_input,
+       .prepare_for_output     = ess_audio_prepare_for_output,
+       .halt_io                = ess_audio_halt_xfer,
+       .trigger                = ess_audio_trigger,
+       .set_speed              = ess_audio_set_speed,
+       .set_bits               = ess_audio_set_bits,
+       .set_channels           = ess_audio_set_channels
 };
 
 /*

diff --git a/sound/oss/sb_midi.c b/sound/oss/sb_midi.c
index bcfa3b3f130808d080567565d781374346c5b76b..449357eec55b868d04ca3c42bf095b595e30368f 100644 (file)
--- a/sound/oss/sb_midi.c
+++ b/sound/oss/sb_midi.c
@@ -146,16 +146,16 @@ void sb_midi_interrupt(sb_devc * devc)
 
 static struct midi_operations sb_midi_operations =
 {
-       owner:          THIS_MODULE,
-       info:           {"Sound Blaster", 0, 0, SNDCARD_SB},
-       converter:      &std_midi_synth,
-       in_info:        {0},
-       open:           sb_midi_open,
-       close:          sb_midi_close,
-       ioctl:          sb_midi_ioctl,
-       outputc:        sb_midi_out,
-       start_read:     sb_midi_start_read,
-       end_read:       sb_midi_end_read,
+       .owner          = THIS_MODULE,
+       .info           = {"Sound Blaster", 0, 0, SNDCARD_SB},
+       .converter      = &std_midi_synth,
+       .in_info        = {0},
+       .open           = sb_midi_open,
+       .close          = sb_midi_close,
+       .ioctl          = sb_midi_ioctl,
+       .outputc        = sb_midi_out,
+       .start_read     = sb_midi_start_read,
+       .end_read       = sb_midi_end_read,
 };
 
 void sb_dsp_midi_init(sb_devc * devc, struct module *owner)

diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c
index c71807a6db9be059695e3fa327aa6538b25d42de..3443039a047708b2cc3234654d1090ae6c3c2f6d 100644 (file)
--- a/sound/oss/sb_mixer.c
+++ b/sound/oss/sb_mixer.c
@@ -626,18 +626,18 @@ static int sb_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
 
 static struct mixer_operations sb_mixer_operations =
 {
-       owner:  THIS_MODULE,
-       id:     "SB",
-       name:   "Sound Blaster",
-       ioctl:  sb_mixer_ioctl
+       .owner  = THIS_MODULE,
+       .id     = "SB",
+       .name   = "Sound Blaster",
+       .ioctl  = sb_mixer_ioctl
 };
 
 static struct mixer_operations als007_mixer_operations =
 {
-       owner:  THIS_MODULE,
-       id:     "ALS007",
-       name:   "Avance ALS-007",
-       ioctl:  sb_mixer_ioctl
+       .owner  = THIS_MODULE,
+       .id     = "ALS007",
+       .name   = "Avance ALS-007",
+       .ioctl  = sb_mixer_ioctl
 };
 
 static void sb_mixer_reset(sb_devc * devc)

diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index 50e9ae0779178bfa210db58cf170dc836b7075c8..90e18f909a459b20e658b01e54d47b083f58a4bd 100644 (file)
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -100,7 +100,6 @@
 
 /*****************************************************************************/
       
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
@@ -1267,11 +1266,11 @@ static int sv_ioctl_mixdev(struct inode *inode, struct file *file, unsigned int
 }
 
 static /*const*/ struct file_operations sv_mixer_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       ioctl:          sv_ioctl_mixdev,
-       open:           sv_open_mixdev,
-       release:        sv_release_mixdev,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .ioctl          = sv_ioctl_mixdev,
+       .open           = sv_open_mixdev,
+       .release        = sv_release_mixdev,
 };
 
 /* --------------------------------------------------------------------- */
@@ -1978,15 +1977,15 @@ static int sv_release(struct inode *inode, struct file *file)
 }
 
 static /*const*/ struct file_operations sv_audio_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       read:           sv_read,
-       write:          sv_write,
-       poll:           sv_poll,
-       ioctl:          sv_ioctl,
-       mmap:           sv_mmap,
-       open:           sv_open,
-       release:        sv_release,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .read           = sv_read,
+       .write          = sv_write,
+       .poll           = sv_poll,
+       .ioctl          = sv_ioctl,
+       .mmap           = sv_mmap,
+       .open           = sv_open,
+       .release        = sv_release,
 };
 
 /* --------------------------------------------------------------------- */
@@ -2260,13 +2259,13 @@ static int sv_midi_release(struct inode *inode, struct file *file)
 }
 
 static /*const*/ struct file_operations sv_midi_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       read:           sv_midi_read,
-       write:          sv_midi_write,
-       poll:           sv_midi_poll,
-       open:           sv_midi_open,
-       release:        sv_midi_release,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .read           = sv_midi_read,
+       .write          = sv_midi_write,
+       .poll           = sv_midi_poll,
+       .open           = sv_midi_open,
+       .release        = sv_midi_release,
 };
 
 /* --------------------------------------------------------------------- */
@@ -2435,11 +2434,11 @@ static int sv_dmfm_release(struct inode *inode, struct file *file)
 }
 
 static /*const*/ struct file_operations sv_dmfm_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       ioctl:          sv_dmfm_ioctl,
-       open:           sv_dmfm_open,
-       release:        sv_dmfm_release,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .ioctl          = sv_dmfm_ioctl,
+       .open           = sv_dmfm_open,
+       .release        = sv_dmfm_release,
 };
 
 /* --------------------------------------------------------------------- */

diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 3907dde09d3600aad6e41c5ae156f5deb4f6c315..1d0eee922c981745081ce9bee89d5a7bd6a4d956 100644 (file)
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -491,15 +491,15 @@ static int sound_mmap(struct file *file, struct vm_area_struct *vma)
 }
 
 struct file_operations oss_sound_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       read:           sound_read,
-       write:          sound_write,
-       poll:           sound_poll,
-       ioctl:          sound_ioctl,
-       mmap:           sound_mmap,
-       open:           sound_open,
-       release:        sound_release,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .read           = sound_read,
+       .write          = sound_write,
+       .poll           = sound_poll,
+       .ioctl          = sound_ioctl,
+       .mmap           = sound_mmap,
+       .open           = sound_open,
+       .release        = sound_release,
 };
 
 /*

diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c
index e564619f9a9ad16e0a4901d54a64e4b99c08d7f3..b3d42dcef13c486e364708e01a513355db4e9aa5 100644 (file)
--- a/sound/oss/sys_timer.c
+++ b/sound/oss/sys_timer.c
@@ -275,14 +275,14 @@ def_tmr_arm(int dev, long time)
 
 struct sound_timer_operations default_sound_timer =
 {
-       owner:          THIS_MODULE,
-       info:           {"System clock", 0},
-       priority:       0,      /* Priority */
-       devlink:        0,      /* Local device link */
-       open:           def_tmr_open,
-       close:          def_tmr_close,
-       event:          def_tmr_event,
-       get_time:       def_tmr_get_time,
-       ioctl:          def_tmr_ioctl,
-       arm_timer:      def_tmr_arm
+       .owner          = THIS_MODULE,
+       .info           = {"System clock", 0},
+       .priority       = 0,    /* Priority */
+       .devlink        = 0,    /* Local device link */
+       .open           = def_tmr_open,
+       .close          = def_tmr_close,
+       .event          = def_tmr_event,
+       .get_time       = def_tmr_get_time,
+       .ioctl          = def_tmr_ioctl,
+       .arm_timer      = def_tmr_arm
 };

diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index ebaa61a54bcc92cc852bbd1fbf07291a241ec6d2..fa31e3352ee8427d9533ac86cdb6a906920dc84e 100644 (file)
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -181,7 +181,6 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/ioport.h>
@@ -2772,15 +2771,15 @@ static int trident_release(struct inode *inode, struct file *file)
 }
 
 static /*const*/ struct file_operations trident_audio_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       read:           trident_read,
-       write:          trident_write,
-       poll:           trident_poll,
-       ioctl:          trident_ioctl,
-       mmap:           trident_mmap,
-       open:           trident_open,
-       release:        trident_release,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .read           = trident_read,
+       .write          = trident_write,
+       .poll           = trident_poll,
+       .ioctl          = trident_ioctl,
+       .mmap           = trident_mmap,
+       .open           = trident_open,
+       .release        = trident_release,
 };
 
 /* trident specific AC97 functions */
@@ -3894,10 +3893,10 @@ static int trident_ioctl_mixdev(struct inode *inode, struct file *file, unsigned
 }
 
 static /*const*/ struct file_operations trident_mixer_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       ioctl:          trident_ioctl_mixdev,
-       open:           trident_open_mixdev,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .ioctl          = trident_ioctl_mixdev,
+       .open           = trident_open_mixdev,
 };
 
 static int ali_reset_5451(struct trident_card *card)
@@ -4376,12 +4375,12 @@ MODULE_LICENSE("GPL");
 #define TRIDENT_MODULE_NAME "trident"
 
 static struct pci_driver trident_pci_driver = {
-       name:           TRIDENT_MODULE_NAME,
-       id_table:       trident_pci_tbl,
-       probe:          trident_probe,
-       remove:         __devexit_p(trident_remove),
-       suspend:        trident_suspend,
-       resume:         trident_resume
+       .name           = TRIDENT_MODULE_NAME,
+       .id_table       = trident_pci_tbl,
+       .probe          = trident_probe,
+       .remove         = __devexit_p(trident_remove),
+       .suspend        = trident_suspend,
+       .resume         = trident_resume
 };
 
 static int __init trident_init_module (void)

diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c
index 86b3fd6f00699aa317452fbbe40c2240703597a8..8b354ec0e74187c2b9d8e44bf272319377bd633d 100644 (file)
--- a/sound/oss/uart401.c
+++ b/sound/oss/uart401.c
@@ -204,17 +204,17 @@ static inline int uart401_buffer_status(int dev)
 
 static const struct midi_operations uart401_operations =
 {
-       owner:          THIS_MODULE,
-       info:           {"MPU-401 (UART) MIDI", 0, 0, SNDCARD_MPU401},
-       converter:      &std_midi_synth,
-       in_info:        {0},
-       open:           uart401_open,
-       close:          uart401_close,
-       outputc:        uart401_out,
-       start_read:     uart401_start_read,
-       end_read:       uart401_end_read,
-       kick:           uart401_kick,
-       buffer_status:  uart401_buffer_status,
+       .owner          = THIS_MODULE,
+       .info           = {"MPU-401 (UART) MIDI", 0, 0, SNDCARD_MPU401},
+       .converter      = &std_midi_synth,
+       .in_info        = {0},
+       .open           = uart401_open,
+       .close          = uart401_close,
+       .outputc        = uart401_out,
+       .start_read     = uart401_start_read,
+       .end_read       = uart401_end_read,
+       .kick           = uart401_kick,
+       .buffer_status  = uart401_buffer_status,
 };
 
 static void enter_uart_mode(uart401_devc * devc)

diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c
index c8686fed360aef7b9b718113d1c9f1bf0cf9d3dc..f7fb117eb61447844683cec1d6ee3f2d0bdeae85 100644 (file)
--- a/sound/oss/uart6850.c
+++ b/sound/oss/uart6850.c
@@ -231,18 +231,18 @@ static inline int uart6850_buffer_status(int dev)
 
 static struct midi_operations uart6850_operations =
 {
-       owner:          THIS_MODULE,
-       info:           {"6850 UART", 0, 0, SNDCARD_UART6850},
-       converter:      &std_midi_synth,
-       in_info:        {0},
-       open:           uart6850_open,
-       close:          uart6850_close,
-       outputc:        uart6850_out,
-       start_read:     uart6850_start_read,
-       end_read:       uart6850_end_read,
-       kick:           uart6850_kick,
-       command:        uart6850_command,
-       buffer_status:  uart6850_buffer_status
+       .owner          = THIS_MODULE,
+       .info           = {"6850 UART", 0, 0, SNDCARD_UART6850},
+       .converter      = &std_midi_synth,
+       .in_info        = {0},
+       .open           = uart6850_open,
+       .close          = uart6850_close,
+       .outputc        = uart6850_out,
+       .start_read     = uart6850_start_read,
+       .end_read       = uart6850_end_read,
+       .kick           = uart6850_kick,
+       .command        = uart6850_command,
+       .buffer_status  = uart6850_buffer_status
 };
 
 

diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c
index 1792ed8b86bde2ddea9cee4cc5febd23a9392051..df92aa26eaf6db21dbf0cc72e7dd2b2e0a6a1fdb 100644 (file)
--- a/sound/oss/v_midi.c
+++ b/sound/oss/v_midi.c
@@ -133,30 +133,30 @@ static inline int v_midi_ioctl (int dev, unsigned cmd, caddr_t arg)
 
 static struct midi_operations v_midi_operations =
 {
-       owner:          THIS_MODULE,
-       info:           {"Loopback MIDI Port 1", 0, 0, SNDCARD_VMIDI},
-       converter:      &std_midi_synth,
-       in_info:        {0},
-       open:           v_midi_open,
-       close:          v_midi_close,
-       ioctl:          v_midi_ioctl,
-       outputc:        v_midi_out,
-       start_read:     v_midi_start_read,
-       end_read:       v_midi_end_read,
+       .owner          = THIS_MODULE,
+       .info           = {"Loopback MIDI Port 1", 0, 0, SNDCARD_VMIDI},
+       .converter      = &std_midi_synth,
+       .in_info        = {0},
+       .open           = v_midi_open,
+       .close          = v_midi_close,
+       .ioctl          = v_midi_ioctl,
+       .outputc        = v_midi_out,
+       .start_read     = v_midi_start_read,
+       .end_read       = v_midi_end_read,
 };
 
 static struct midi_operations v_midi_operations2 =
 {
-       owner:          THIS_MODULE,
-       info:           {"Loopback MIDI Port 2", 0, 0, SNDCARD_VMIDI},
-       converter:      &std_midi_synth,
-       in_info:        {0},
-       open:           v_midi_open,
-       close:          v_midi_close,
-       ioctl:          v_midi_ioctl,
-       outputc:        v_midi_out,
-       start_read:     v_midi_start_read,
-       end_read:       v_midi_end_read,
+       .owner          = THIS_MODULE,
+       .info           = {"Loopback MIDI Port 2", 0, 0, SNDCARD_VMIDI},
+       .converter      = &std_midi_synth,
+       .in_info        = {0},
+       .open           = v_midi_open,
+       .close          = v_midi_close,
+       .ioctl          = v_midi_ioctl,
+       .outputc        = v_midi_out,
+       .start_read     = v_midi_start_read,
+       .end_read       = v_midi_end_read,
 };
 
 /*

diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index 8dd2a009c583a2546e1ee8e02f984111ab3bebb7..24199a78cf25032e14a782587de2d21b001b501b 100644 (file)
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -360,10 +360,10 @@ MODULE_DEVICE_TABLE(pci,via_pci_tbl);
 
 
 static struct pci_driver via_driver = {
-       name:           VIA_MODULE_NAME,
-       id_table:       via_pci_tbl,
-       probe:          via_init_one,
-       remove:         __devexit_p(via_remove_one),
+       .name           = VIA_MODULE_NAME,
+       .id_table       = via_pci_tbl,
+       .probe          = via_init_one,
+       .remove         = __devexit_p(via_remove_one),
 };
 
 
@@ -1412,10 +1412,10 @@ out:
 
 
 static struct file_operations via_mixer_fops = {
-       owner:          THIS_MODULE,
-       open:           via_mixer_open,
-       llseek:         no_llseek,
-       ioctl:          via_mixer_ioctl,
+       .owner          = THIS_MODULE,
+       .open           = via_mixer_open,
+       .llseek         = no_llseek,
+       .ioctl          = via_mixer_ioctl,
 };
 
 
@@ -1783,15 +1783,15 @@ static int via_interrupt_init (struct via_info *card)
  */
 
 static struct file_operations via_dsp_fops = {
-       owner:          THIS_MODULE,
-       open:           via_dsp_open,
-       release:        via_dsp_release,
-       read:           via_dsp_read,
-       write:          via_dsp_write,
-       poll:           via_dsp_poll,
-       llseek:         no_llseek,
-       ioctl:          via_dsp_ioctl,
-       mmap:           via_dsp_mmap,
+       .owner          = THIS_MODULE,
+       .open           = via_dsp_open,
+       .release        = via_dsp_release,
+       .read           = via_dsp_read,
+       .write          = via_dsp_write,
+       .poll           = via_dsp_poll,
+       .llseek         = no_llseek,
+       .ioctl          = via_dsp_ioctl,
+       .mmap           = via_dsp_mmap,
 };
 
 
@@ -1902,10 +1902,10 @@ static int via_mm_swapout (struct page *page, struct file *filp)
 
 
 struct vm_operations_struct via_mm_ops = {
-       nopage:         via_mm_nopage,
+       .nopage         = via_mm_nopage,
 
 #ifndef VM_RESERVED
-       swapout:        via_mm_swapout,
+       .swapout        = via_mm_swapout,
 #endif
 };
 

diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index 756634835d62c404fc1bd09467a5fdb070496a0e..bbfc12cf81078b6d6940bfb808754c5b078ba77d 100644 (file)
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -366,26 +366,26 @@ static void vidc_audio_trigger(int dev, int enable_bits)
 
 static struct audio_driver vidc_audio_driver =
 {
-       owner:                  THIS_MODULE,
-       open:                   vidc_audio_open,
-       close:                  vidc_audio_close,
-       output_block:           vidc_audio_output_block,
-       start_input:            vidc_audio_start_input,
-       prepare_for_input:      vidc_audio_prepare_for_input,
-       prepare_for_output:     vidc_audio_prepare_for_output,
-       halt_io:                vidc_audio_reset,
-       local_qlen:             vidc_audio_local_qlen,
-       trigger:                vidc_audio_trigger,
-       set_speed:              vidc_audio_set_speed,
-       set_bits:               vidc_audio_set_format,
-       set_channels:           vidc_audio_set_channels
+       .owner                  = THIS_MODULE,
+       .open                   = vidc_audio_open,
+       .close                  = vidc_audio_close,
+       .output_block           = vidc_audio_output_block,
+       .start_input            = vidc_audio_start_input,
+       .prepare_for_input      = vidc_audio_prepare_for_input,
+       .prepare_for_output     = vidc_audio_prepare_for_output,
+       .halt_io                = vidc_audio_reset,
+       .local_qlen             = vidc_audio_local_qlen,
+       .trigger                = vidc_audio_trigger,
+       .set_speed              = vidc_audio_set_speed,
+       .set_bits               = vidc_audio_set_format,
+       .set_channels           = vidc_audio_set_channels
 };
 
 static struct mixer_operations vidc_mixer_operations = {
-       owner:          THIS_MODULE,
-       id:             "VIDC",
-       name:           "VIDCsound",
-       ioctl:          vidc_mixer_ioctl
+       .owner          = THIS_MODULE,
+       .id             = "VIDC",
+       .name           = "VIDCsound",
+       .ioctl          = vidc_mixer_ioctl
 };
 
 void vidc_update_filler(int format, int channels)

diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index 2e4d1105bb66f167b265cd119015635ebb3c03a4..c38833215effbda091dcda2c927d98fbc64e0211 100644 (file)
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -815,21 +815,21 @@ waveartist_set_bits(int dev, unsigned int arg)
 }
 
 static struct audio_driver waveartist_audio_driver = {
-       owner:                  THIS_MODULE,
-       open:                   waveartist_open,
-       close:                  waveartist_close,
-       output_block:           waveartist_output_block,
-       start_input:            waveartist_start_input,
-       ioctl:                  waveartist_ioctl,
-       prepare_for_input:      waveartist_prepare_for_input,
-       prepare_for_output:     waveartist_prepare_for_output,
-       halt_io:                waveartist_halt,
-       halt_input:             waveartist_halt_input,
-       halt_output:            waveartist_halt_output,
-       trigger:                waveartist_trigger,
-       set_speed:              waveartist_set_speed,
-       set_bits:               waveartist_set_bits,
-       set_channels:           waveartist_set_channels
+       .owner                  = THIS_MODULE,
+       .open                   = waveartist_open,
+       .close                  = waveartist_close,
+       .output_block           = waveartist_output_block,
+       .start_input            = waveartist_start_input,
+       .ioctl                  = waveartist_ioctl,
+       .prepare_for_input      = waveartist_prepare_for_input,
+       .prepare_for_output     = waveartist_prepare_for_output,
+       .halt_io                = waveartist_halt,
+       .halt_input             = waveartist_halt_input,
+       .halt_output            = waveartist_halt_output,
+       .trigger                = waveartist_trigger,
+       .set_speed              = waveartist_set_speed,
+       .set_bits               = waveartist_set_bits,
+       .set_channels           = waveartist_set_channels
 };
 
 
@@ -1062,15 +1062,15 @@ static int waveartist_get_mixer(wavnc_info *devc, int dev)
 }
 
 static const struct waveartist_mixer_info waveartist_mixer = {
-       supported_devs: SUPPORTED_MIXER_DEVICES | SOUND_MASK_IGAIN,
-       recording_devs: SOUND_MASK_LINE  | SOUND_MASK_MIC   |
+       .supported_devs = SUPPORTED_MIXER_DEVICES | SOUND_MASK_IGAIN,
+       .recording_devs = SOUND_MASK_LINE  | SOUND_MASK_MIC   |
                        SOUND_MASK_LINE1 | SOUND_MASK_LINE2 |
                        SOUND_MASK_IMIX,
-       stereo_devs:    (SUPPORTED_MIXER_DEVICES | SOUND_MASK_IGAIN) & ~
+       .stereo_devs    = (SUPPORTED_MIXER_DEVICES | SOUND_MASK_IGAIN) & ~
                        (SOUND_MASK_SPEAKER | SOUND_MASK_IMIX),
-       select_input:   waveartist_select_input,
-       decode_mixer:   waveartist_decode_mixer,
-       get_mixer:      waveartist_get_mixer,
+       .select_input   = waveartist_select_input,
+       .decode_mixer   = waveartist_decode_mixer,
+       .get_mixer      = waveartist_get_mixer,
 };
 
 static void
@@ -1203,10 +1203,10 @@ waveartist_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
 
 static struct mixer_operations waveartist_mixer_operations =
 {
-       owner:  THIS_MODULE,
-       id:     "WaveArtist",
-       name:   "WaveArtist",
-       ioctl:  waveartist_mixer_ioctl
+       .owner  = THIS_MODULE,
+       .id     = "WaveArtist",
+       .name   = "WaveArtist",
+       .ioctl  = waveartist_mixer_ioctl
 };
 
 static void
@@ -1692,24 +1692,24 @@ static int netwinder_get_mixer(wavnc_info *devc, int dev)
  * Waveartist specific mixer information.
  */
 static const struct waveartist_mixer_info netwinder_mixer = {
-       supported_devs: SOUND_MASK_VOLUME  | SOUND_MASK_SYNTH   |
+       .supported_devs = SOUND_MASK_VOLUME  | SOUND_MASK_SYNTH   |
                        SOUND_MASK_PCM     | SOUND_MASK_SPEAKER |
                        SOUND_MASK_LINE    | SOUND_MASK_MIC     |
                        SOUND_MASK_IMIX    | SOUND_MASK_LINE1   |
                        SOUND_MASK_PHONEIN | SOUND_MASK_PHONEOUT|
                        SOUND_MASK_IGAIN,
 
-       recording_devs: SOUND_MASK_LINE    | SOUND_MASK_MIC     |
+       .recording_devs = SOUND_MASK_LINE    | SOUND_MASK_MIC     |
                        SOUND_MASK_IMIX    | SOUND_MASK_LINE1   |
                        SOUND_MASK_PHONEIN,
 
-       stereo_devs:    SOUND_MASK_VOLUME  | SOUND_MASK_SYNTH   |
+       .stereo_devs    = SOUND_MASK_VOLUME  | SOUND_MASK_SYNTH   |
                        SOUND_MASK_PCM     | SOUND_MASK_LINE    |
                        SOUND_MASK_IMIX    | SOUND_MASK_IGAIN,
 
-       select_input:   netwinder_select_input,
-       decode_mixer:   netwinder_decode_mixer,
-       get_mixer:      netwinder_get_mixer,
+       .select_input   = netwinder_select_input,
+       .decode_mixer   = netwinder_decode_mixer,
+       .get_mixer      = netwinder_get_mixer,
 };
 
 static void

diff --git a/sound/oss/wavfront.c b/sound/oss/wavfront.c
index 1a49ecfaf76c31fb53d8631548a8dfeda8f86457..b79a57cfd48f3016bf394e0bf8c3355d44b6c7c0 100644 (file)
--- a/sound/oss/wavfront.c
+++ b/sound/oss/wavfront.c
@@ -1961,11 +1961,11 @@ wavefront_ioctl(struct inode *inode, struct file *file,
 }
 
 static /*const*/ struct file_operations wavefront_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       ioctl:          wavefront_ioctl,
-       open:           wavefront_open,
-       release:        wavefront_release,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .ioctl          = wavefront_ioctl,
+       .open           = wavefront_open,
+       .release        = wavefront_release,
 };
 
 \f
@@ -2078,25 +2078,25 @@ wavefront_oss_load_patch (int devno, int format, const char *addr,
 
 static struct synth_operations wavefront_operations =
 {
-       owner:          THIS_MODULE,
-       id:             "WaveFront",
-       info:           &wavefront_info,
-       midi_dev:       0,
-       synth_type:     SYNTH_TYPE_SAMPLE,
-       synth_subtype:  SAMPLE_TYPE_WAVEFRONT,
-       open:           wavefront_oss_open,
-       close:          wavefront_oss_close,
-       ioctl:          wavefront_oss_ioctl,
-       kill_note:      midi_synth_kill_note,
-       start_note:     midi_synth_start_note,
-       set_instr:      midi_synth_set_instr,
-       reset:          midi_synth_reset,
-       load_patch:     midi_synth_load_patch,
-       aftertouch:     midi_synth_aftertouch,
-       controller:     midi_synth_controller,
-       panning:        midi_synth_panning,
-       bender:         midi_synth_bender,
-       setup_voice:    midi_synth_setup_voice
+       .owner          = THIS_MODULE,
+       .id             = "WaveFront",
+       .info           = &wavefront_info,
+       .midi_dev       = 0,
+       .synth_type     = SYNTH_TYPE_SAMPLE,
+       .synth_subtype  = SAMPLE_TYPE_WAVEFRONT,
+       .open           = wavefront_oss_open,
+       .close          = wavefront_oss_close,
+       .ioctl          = wavefront_oss_ioctl,
+       .kill_note      = midi_synth_kill_note,
+       .start_note     = midi_synth_start_note,
+       .set_instr      = midi_synth_set_instr,
+       .reset          = midi_synth_reset,
+       .load_patch     = midi_synth_load_patch,
+       .aftertouch     = midi_synth_aftertouch,
+       .controller     = midi_synth_controller,
+       .panning        = midi_synth_panning,
+       .bender         = midi_synth_bender,
+       .setup_voice    = midi_synth_setup_voice
 };
 #endif /* OSS_SUPPORT_SEQ */
 

diff --git a/sound/oss/wf_midi.c b/sound/oss/wf_midi.c
index a4224cf9b393af2838c2b13d0deb71da50033eaa..2a005d3bb3603fdc6784e314e15bb82f8c54ad94 100644 (file)
--- a/sound/oss/wf_midi.c
+++ b/sound/oss/wf_midi.c
@@ -552,16 +552,16 @@ static struct midi_operations  wf_mpu_midi_operations[2];
 
 static struct midi_operations wf_mpu_midi_proto =
 {
-       owner:          THIS_MODULE,
-       info:           {"WF-MPU MIDI", 0, MIDI_CAP_MPU401, SNDCARD_MPU401},
-       in_info:        {0},   /* in_info */
-       open:           wf_mpu_open,
-       close:          wf_mpu_close,
-       ioctl:          wf_mpu_ioctl,
-       outputc:        wf_mpu_out,
-       start_read:     wf_mpu_start_read,
-       end_read:       wf_mpu_end_read,
-       buffer_status:  wf_mpu_buffer_status,
+       .owner          = THIS_MODULE,
+       .info           = {"WF-MPU MIDI", 0, MIDI_CAP_MPU401, SNDCARD_MPU401},
+       .in_info        = {0},   /* in_info */
+       .open           = wf_mpu_open,
+       .close          = wf_mpu_close,
+       .ioctl          = wf_mpu_ioctl,
+       .outputc        = wf_mpu_out,
+       .start_read     = wf_mpu_start_read,
+       .end_read       = wf_mpu_end_read,
+       .buffer_status  = wf_mpu_buffer_status,
 };
 
 static struct synth_info wf_mpu_synth_info_proto =
@@ -668,27 +668,27 @@ wf_mpu_synth_close (int dev)
 
 static struct synth_operations wf_mpu_synth_proto =
 {
-       owner:          THIS_MODULE,
-       id:             "WaveFront (ICS2115)",
-       info:           NULL,  /* info field, filled in during configuration */
-       midi_dev:       0,     /* MIDI dev XXX should this be -1 ? */
-       synth_type:     SYNTH_TYPE_MIDI,
-       synth_subtype:  SAMPLE_TYPE_WAVEFRONT,
-       open:           wf_mpu_synth_open,
-       close:          wf_mpu_synth_close,
-       ioctl:          wf_mpu_synth_ioctl,
-       kill_note:      midi_synth_kill_note,
-       start_note:     midi_synth_start_note,
-       set_instr:      midi_synth_set_instr,
-       reset:          midi_synth_reset,
-       hw_control:     midi_synth_hw_control,
-       load_patch:     midi_synth_load_patch,
-       aftertouch:     midi_synth_aftertouch,
-       controller:     midi_synth_controller,
-       panning:        midi_synth_panning,
-       bender:         midi_synth_bender,
-       setup_voice:    midi_synth_setup_voice,
-       send_sysex:     midi_synth_send_sysex
+       .owner          = THIS_MODULE,
+       .id             = "WaveFront (ICS2115)",
+       .info           = NULL,  /* info field, filled in during configuration */
+       .midi_dev       = 0,     /* MIDI dev XXX should this be -1 ? */
+       .synth_type     = SYNTH_TYPE_MIDI,
+       .synth_subtype  = SAMPLE_TYPE_WAVEFRONT,
+       .open           = wf_mpu_synth_open,
+       .close          = wf_mpu_synth_close,
+       .ioctl          = wf_mpu_synth_ioctl,
+       .kill_note      = midi_synth_kill_note,
+       .start_note     = midi_synth_start_note,
+       .set_instr      = midi_synth_set_instr,
+       .reset          = midi_synth_reset,
+       .hw_control     = midi_synth_hw_control,
+       .load_patch     = midi_synth_load_patch,
+       .aftertouch     = midi_synth_aftertouch,
+       .controller     = midi_synth_controller,
+       .panning        = midi_synth_panning,
+       .bender         = midi_synth_bender,
+       .setup_voice    = midi_synth_setup_voice,
+       .send_sysex     = midi_synth_send_sysex
 };
 
 static int

diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c
index a0012f93091b6cac2b7d423162a83539406fad4a..c3716ea2181c376cb874debea83797445fc642b4 100644 (file)
--- a/sound/oss/ymfpci.c
+++ b/sound/oss/ymfpci.c
@@ -2038,23 +2038,23 @@ static int ymf_release_mixdev(struct inode *inode, struct file *file)
 }
 
 static /*const*/ struct file_operations ymf_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       read:           ymf_read,
-       write:          ymf_write,
-       poll:           ymf_poll,
-       ioctl:          ymf_ioctl,
-       mmap:           ymf_mmap,
-       open:           ymf_open,
-       release:        ymf_release,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .read           = ymf_read,
+       .write          = ymf_write,
+       .poll           = ymf_poll,
+       .ioctl          = ymf_ioctl,
+       .mmap           = ymf_mmap,
+       .open           = ymf_open,
+       .release        = ymf_release,
 };
 
 static /*const*/ struct file_operations ymf_mixer_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       ioctl:          ymf_ioctl_mixdev,
-       open:           ymf_open_mixdev,
-       release:        ymf_release_mixdev,
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .ioctl          = ymf_ioctl_mixdev,
+       .open           = ymf_open_mixdev,
+       .release        = ymf_release_mixdev,
 };
 
 /*
@@ -2650,12 +2650,12 @@ MODULE_DESCRIPTION("Yamaha YMF7xx PCI Audio");
 MODULE_LICENSE("GPL");
 
 static struct pci_driver ymfpci_driver = {
-       name:           "ymfpci",
-       id_table:       ymf_id_tbl,
-       probe:          ymf_probe_one,
-       remove:         __devexit_p(ymf_remove_one),
-       suspend:        ymf_suspend,
-       resume:         ymf_resume
+       .name           = "ymfpci",
+       .id_table       = ymf_id_tbl,
+       .probe          = ymf_probe_one,
+       .remove         = __devexit_p(ymf_remove_one),
+       .suspend        = ymf_suspend,
+       .resume         = ymf_resume
 };
 
 static int __init ymf_init_module(void)