C99 initializer cleanup for sound/oss
PATCH 1/1 C99 initializer cleanup for sound/oss
Hi.
The latest Linus BK has added C99 initializers to many of the files in sound/oss. A few files were missed or not completely converted. Here is a small patchset that fixes the missed conversions I found.
Art Haas
===== sound/oss/es1370.c 1.20 vs edited =====
sound/oss/es1370.c +4 -4
@@ -2731,10 +2731,10 @@MODULE_DEVICE_TABLE (pci, id_table);static struct pci_driver es1370_driver = { - name:"es1370" , - id_table: id_table, - probe: es1370_probe, - remove: es1370_remove + .name ="es1370" , + .id_table = id_table, + .probe = es1370_probe, + .remove = es1370_remove, };static int __init init_es1370 (void )
===== sound/oss/aci.c 1.7 vs edited =====
sound/oss/aci.c +3 -3
@@ -584,9 +584,9 @@static struct mixer_operations aci_mixer_operations = { - owner:THIS_MODULE , - id:"ACI" , - ioctl: aci_mixer_ioctl + .owner =THIS_MODULE , + .id ="ACI" , + .ioctl = aci_mixer_ioctl };/*
===== sound/oss/nec_vrc5477.c 1.10 vs edited =====
sound/oss/nec_vrc5477.c +4 -4
@@ -1994,10 +1994,10 @@MODULE_DEVICE_TABLE (pci, id_table);static struct pci_driver vrc5477_ac97_driver = { - name:VRC5477_AC97_MODULE_NAME , - id_table: id_table, - probe: vrc5477_ac97_probe, - remove: vrc5477_ac97_remove + .name =VRC5477_AC97_MODULE_NAME , + .id_table = id_table, + .probe = vrc5477_ac97_probe, + .remove = vrc5477_ac97_remove, };static int __init init_vrc5477_ac97 (void )
===== sound/oss/ite8172.c 1.11 vs edited =====
sound/oss/ite8172.c +4 -4
@@ -1930,10 +1930,10 @@MODULE_DEVICE_TABLE (pci, id_table);static struct pci_driver it8172_driver = { - name:IT8172_MODULE_NAME , - id_table: id_table, - probe: it8172_probe, - remove: it8172_remove + .name =IT8172_MODULE_NAME , + .id_table = id_table, + .probe = it8172_probe, + .remove = it8172_remove, };static int __init init_it8172 (void )
===== sound/oss/esssolo1.c 1.22 vs edited =====
sound/oss/esssolo1.c +6 -6
@@ -2448,12 +2448,12 @@MODULE_DEVICE_TABLE (pci, id_table);static struct pci_driver solo1_driver = { - name:"ESS Solo1" , - id_table: id_table, - probe: solo1_probe, - remove: solo1_remove, - suspend: solo1_suspend, - resume: solo1_resume + .name ="ESS Solo1" , + .id_table = id_table, + .probe = solo1_probe, + .remove = solo1_remove, + .suspend = solo1_suspend, + .resume = solo1_resume, };
===== sound/oss/es1371.c 1.22 vs edited =====
sound/oss/es1371.c +4 -4
@@ -3035,10 +3035,10 @@MODULE_DEVICE_TABLE (pci, id_table);static struct pci_driver es1371_driver = { - name:"es1371" , - id_table: id_table, - probe: es1371_probe, - remove: es1371_remove + .name ="es1371" , + .id_table = id_table, + .probe = es1371_probe, + .remove = es1371_remove, };static int __init init_es1371 (void )
===== sound/oss/sound_timer.c 1.3 vs edited =====
sound/oss/sound_timer.c +10 -10
@@ -264,16 +264,16 @@static struct sound_timer_operations sound_timer = { - owner:THIS_MODULE , - info: {"Sound Timer" ,0 }, - priority:1 ,/* Priority */ - devlink:0 ,/* Local device link */ - open: timer_open, - close: timer_close, - event: timer_event, - get_time: timer_get_time, - ioctl: timer_ioctl, - arm_timer: timer_arm + .owner =THIS_MODULE , + .info = {"Sound Timer" ,0 }, + .priority =1 ,/* Priority */ + .devlink =0 ,/* Local device link */ + .open = timer_open, + .close = timer_close, + .event = timer_event, + .get_time = timer_get_time, + .ioctl = timer_ioctl, + .arm_timer = timer_arm };void sound_timer_interrupt (void )
===== sound/oss/sonicvibes.c 1.17 vs edited =====
sound/oss/sonicvibes.c +4 -4
@@ -2715,10 +2715,10 @@MODULE_DEVICE_TABLE (pci, id_table);static struct pci_driver sv_driver = { - name:"sonicvibes" , - id_table: id_table, - probe: sv_probe, - remove: sv_remove + .name ="sonicvibes" , + .id_table = id_table, + .probe = sv_probe, + .remove = sv_remove, };static int __init init_sonicvibes (void )
===== sound/oss/sb_card.h 1.3 vs edited =====
sound/oss/sb_card.h +66 -66
187 lines not on this page · raw message
===== sound/oss/nm256_audio.c 1.10 vs edited =====
sound/oss/nm256_audio.c +18 -18
@@ -925,10 +925,10 @@ }static struct mixer_operations nm256_mixer_operations = { - .owner =THIS_MODULE , - .id ="NeoMagic" , - .name ="NM256AC97Mixer" , - .ioctl = nm256_default_mixer_ioctl + .owner =THIS_MODULE , + .id ="NeoMagic" , + .name ="NM256AC97Mixer" , + .ioctl = nm256_default_mixer_ioctl };/*
@@ -1632,16 +1632,16 @@static struct audio_driver nm256_audio_driver = { - .owner =THIS_MODULE , - .open = nm256_audio_open, - .close = nm256_audio_close, - .output_block = nm256_audio_output_block, - .start_input = nm256_audio_start_input, - .ioctl = nm256_audio_ioctl, - .prepare_for_input = nm256_audio_prepare_for_input, - .prepare_for_output = nm256_audio_prepare_for_output, - .halt_io = nm256_audio_reset, - .local_qlen = nm256_audio_local_qlen, + .owner =THIS_MODULE , + .open = nm256_audio_open, + .close = nm256_audio_close, + .output_block = nm256_audio_output_block, + .start_input = nm256_audio_start_input, + .ioctl = nm256_audio_ioctl, + .prepare_for_input = nm256_audio_prepare_for_input, + .prepare_for_output = nm256_audio_prepare_for_output, + .halt_io = nm256_audio_reset, + .local_qlen = nm256_audio_local_qlen, };static struct pci_device_id nm256_pci_tbl[]__devinitdata = {
@@ -1656,10 +1656,10 @@struct pci_driver nm256_pci_driver = { - name:"nm256_audio" , - id_table:nm256_pci_tbl, - probe:nm256_probe, - remove:nm256_remove, + .name ="nm256_audio" , + .id_table = nm256_pci_tbl, + .probe = nm256_probe, + .remove = nm256_remove, };MODULE_PARM (usecache,"i" );
Signature · 4 lines
To announce that there must be no criticism of the President, or that we are to stand by the President, right or wrong, is not only unpatriotic and servile, but is morally treasonable to the American public. -- Theodore Roosevelt, Kansas City Star, 1918
Quoted 3 lines
The latest Linus BK has added C99 initializers to many of the files in
sound/oss. A few files were missed or not completely converted. Here is a small patchset that fixes the missed conversions I found.
Thanks, I must have somehow missed those.
Quoted 1 line
Art Haas
Maciej