Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6581f4e74d8541dd7d579f64e94822622cbb1654

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent 0fbf405c58
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ALSA] Remove zero-initialization of static variables 

Removed zero-initializations of static variables.
A tiny optimization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 29 changed files with 46 additions and 63 deletions Side-by-side Diff

sound/arm/sa11xx-uda1341.c
Diff comments   View file @ 6581f4e
... ... @@ -112,7 +112,7 @@
112 112 MODULE_DESCRIPTION("SA1100/SA1111 + UDA1341TS driver for ALSA");
113 113 MODULE_SUPPORTED_DEVICE("{{UDA1341,iPAQ H3600 UDA1341TS}}");
114 114  
115   -static char *id = NULL; /* ID for this card */
  115 +static char *id; /* ID for this card */
116 116  
117 117 module_param(id, charp, 0444);
118 118 MODULE_PARM_DESC(id, "ID string for SA1100/SA1111 + UDA1341TS soundcard.");
... ... @@ -143,12 +143,12 @@
143 143  
144 144 */
145 145  
146   -static struct proc_dir_entry *snd_proc_root = NULL;
147   -struct snd_info_entry *snd_seq_root = NULL;
  146 +static struct proc_dir_entry *snd_proc_root;
  147 +struct snd_info_entry *snd_seq_root;
148 148 EXPORT_SYMBOL(snd_seq_root);
149 149  
150 150 #ifdef CONFIG_SND_OSSEMUL
151   -struct snd_info_entry *snd_oss_root = NULL;
  151 +struct snd_info_entry *snd_oss_root;
152 152 #endif
153 153  
154 154 static inline void snd_info_entry_prepare(struct proc_dir_entry *de)
... ... @@ -972,7 +972,7 @@
972 972  
973 973 */
974 974  
975   -static struct snd_info_entry *snd_info_version_entry = NULL;
  975 +static struct snd_info_entry *snd_info_version_entry;
976 976  
977 977 static void snd_info_version_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
978 978 {
... ... @@ -38,8 +38,8 @@
38 38 struct snd_shutdown_f_ops *next;
39 39 };
40 40  
41   -static unsigned int snd_cards_lock = 0; /* locked for registering/using */
42   -struct snd_card *snd_cards[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = NULL};
  41 +static unsigned int snd_cards_lock; /* locked for registering/using */
  42 +struct snd_card *snd_cards[SNDRV_CARDS];
43 43 EXPORT_SYMBOL(snd_cards);
44 44  
45 45 static DEFINE_MUTEX(snd_card_mutex);
... ... @@ -529,7 +529,7 @@
529 529 EXPORT_SYMBOL(snd_card_register);
530 530  
531 531 #ifdef CONFIG_PROC_FS
532   -static struct snd_info_entry *snd_card_info_entry = NULL;
  532 +static struct snd_info_entry *snd_card_info_entry;
533 533  
534 534 static void snd_card_info_read(struct snd_info_entry *entry,
535 535 struct snd_info_buffer *buffer)
sound/core/oss/pcm_oss.c
Diff comments   View file @ 6581f4e
... ... @@ -45,7 +45,7 @@
45 45  
46 46 #define OSS_ALSAEMULVER _SIOR ('M', 249, int)
47 47  
48   -static int dsp_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 0};
  48 +static int dsp_map[SNDRV_CARDS];
49 49 static int adsp_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};
50 50 static int nonblock_open = 1;
51 51  
... ... @@ -1072,7 +1072,7 @@
1072 1072 mutex_unlock(&register_mutex);
1073 1073 }
1074 1074  
1075   -static struct snd_info_entry *snd_pcm_proc_entry = NULL;
  1075 +static struct snd_info_entry *snd_pcm_proc_entry;
1076 1076  
1077 1077 static void snd_pcm_proc_init(void)
1078 1078 {
sound/core/rawmidi.c
Diff comments   View file @ 6581f4e
... ... @@ -43,7 +43,7 @@
43 43 MODULE_LICENSE("GPL");
44 44  
45 45 #ifdef CONFIG_SND_OSSEMUL
46   -static int midi_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 0};
  46 +static int midi_map[SNDRV_CARDS];
47 47 static int amidi_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};
48 48 module_param_array(midi_map, int, NULL, 0444);
49 49 MODULE_PARM_DESC(midi_map, "Raw MIDI device number assigned to 1st OSS device.");
sound/core/seq/seq_device.c
Diff comments   View file @ 6581f4e
... ... @@ -80,7 +80,7 @@
80 80 static int num_ops;
81 81 static DEFINE_MUTEX(ops_mutex);
82 82 #ifdef CONFIG_PROC_FS
83   -static struct snd_info_entry *info_entry = NULL;
  83 +static struct snd_info_entry *info_entry;
84 84 #endif
85 85  
86 86 /*
sound/core/seq/seq_dummy.c
Diff comments   View file @ 6581f4e
... ... @@ -66,7 +66,7 @@
66 66 MODULE_ALIAS("snd-seq-client-" __stringify(SNDRV_SEQ_CLIENT_DUMMY));
67 67  
68 68 static int ports = 1;
69   -static int duplex = 0;
  69 +static int duplex;
70 70  
71 71 module_param(ports, int, 0444);
72 72 MODULE_PARM_DESC(ports, "number of ports to be created");
... ... @@ -332,7 +332,7 @@
332 332 * INFO PART
333 333 */
334 334  
335   -static struct snd_info_entry *snd_minor_info_entry = NULL;
  335 +static struct snd_info_entry *snd_minor_info_entry;
336 336  
337 337 static const char *snd_device_type_name(int type)
338 338 {
sound/core/sound_oss.c
Diff comments   View file @ 6581f4e
... ... @@ -209,7 +209,7 @@
209 209  
210 210 #ifdef CONFIG_PROC_FS
211 211  
212   -static struct snd_info_entry *snd_minor_info_oss_entry = NULL;
  212 +static struct snd_info_entry *snd_minor_info_oss_entry;
213 213  
214 214 static const char *snd_oss_device_type_name(int type)
215 215 {
... ... @@ -1106,7 +1106,7 @@
1106 1106 mutex_unlock(&register_mutex);
1107 1107 }
1108 1108  
1109   -static struct snd_info_entry *snd_timer_proc_entry = NULL;
  1109 +static struct snd_info_entry *snd_timer_proc_entry;
1110 1110  
1111 1111 static void __init snd_timer_proc_init(void)
1112 1112 {
sound/drivers/virmidi.c
Diff comments   View file @ 6581f4e
... ... @@ -65,7 +65,7 @@
65 65  
66 66 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
67 67 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
68   -static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
  68 +static int enable[SNDRV_CARDS];
69 69 static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
70 70  
71 71 module_param_array(index, int, NULL, 0444);
sound/isa/gus/interwave.c
Diff comments   View file @ 6581f4e
... ... @@ -70,9 +70,9 @@
70 70 static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7 */
71 71 static int joystick_dac[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 29};
72 72 /* 0 to 31, (0.59V-4.52V or 0.389V-2.98V) */
73   -static int midi[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
  73 +static int midi[SNDRV_CARDS];
74 74 static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
75   -static int effect[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
  75 +static int effect[SNDRV_CARDS];
76 76  
77 77 #ifdef SNDRV_STB
78 78 #define PFX "interwave-stb: "
... ... @@ -59,7 +59,7 @@
59 59 static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 0,1,3,5,9,11,12,15 */
60 60 static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 1,3,5,6,7 */
61 61 static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 1,3,5,6,7 */
62   -static int opl3sa3_ymode[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 0 }; /* 0,1,2,3 */ /*SL Added*/
  62 +static int opl3sa3_ymode[SNDRV_CARDS]; /* 0,1,2,3 */ /*SL Added*/
63 63  
64 64 module_param_array(index, int, NULL, 0444);
65 65 MODULE_PARM_DESC(index, "Index value for OPL3-SA soundcard.");
sound/isa/sb/emu8000_patch.c
Diff comments   View file @ 6581f4e
... ... @@ -23,7 +23,7 @@
23 23 #include <asm/uaccess.h>
24 24 #include <linux/moduleparam.h>
25 25  
26   -static int emu8000_reset_addr = 0;
  26 +static int emu8000_reset_addr;
27 27 module_param(emu8000_reset_addr, int, 0444);
28 28 MODULE_PARM_DESC(emu8000_reset_addr, "reset write address at each time (makes slowdown)");
29 29  
... ... @@ -85,7 +85,7 @@
85 85 static int dma16[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 5,6,7 */
86 86 static int mic_agc[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
87 87 #ifdef CONFIG_SND_SB16_CSP
88   -static int csp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
  88 +static int csp[SNDRV_CARDS];
89 89 #endif
90 90 #ifdef SNDRV_SBAWE_EMU8000
91 91 static int seq_ports[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
sound/isa/wavefront/wavefront.c
Diff comments   View file @ 6581f4e
... ... @@ -50,7 +50,7 @@
50 50 static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
51 51 static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7 */
52 52 static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7 */
53   -static int use_cs4232_midi[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
  53 +static int use_cs4232_midi[SNDRV_CARDS];
54 54  
55 55 module_param_array(index, int, NULL, 0444);
56 56 MODULE_PARM_DESC(index, "Index value for WaveFront soundcard.");
sound/pci/ali5451/ali5451.c
Diff comments   View file @ 6581f4e
... ... @@ -49,7 +49,7 @@
49 49 static int index = SNDRV_DEFAULT_IDX1; /* Index */
50 50 static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */
51 51 static int pcm_channels = 32;
52   -static int spdif = 0;
  52 +static int spdif;
53 53  
54 54 module_param(index, int, 0444);
55 55 MODULE_PARM_DESC(index, "Index value for ALI M5451 PCI Audio.");
sound/pci/au88x0/au88x0_xtalk.c
Diff comments   View file @ 6581f4e
... ... @@ -66,31 +66,20 @@
66 66 0
67 67 //0x7FFF,0x7FFF,0x7FFF,0x7FFF,0x7fff,0x7FFF,0x7FFF,0x7FFF,0x7FFF,0x7fff
68 68 };
69   -static xtalk_gains_t const asXtalkGainsZeros = {
70   - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
71   -};
  69 +static xtalk_gains_t const asXtalkGainsZeros;
72 70  
73   -static xtalk_dline_t const alXtalkDlineZeros = {
74   - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
75   - 0, 0, 0,
76   - 0, 0, 0, 0, 0, 0, 0
77   -};
  71 +static xtalk_dline_t const alXtalkDlineZeros;
78 72 static xtalk_dline_t const alXtalkDlineTest = {
79 73 0xFC18, 0x03E8FFFF, 0x186A0, 0x7960FFFE, 1, 0xFFFFFFFF,
80 74 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
81 75 0, 0, 0, 0
82 76 };
83 77  
84   -static xtalk_instate_t const asXtalkInStateZeros = { 0, 0, 0, 0 };
  78 +static xtalk_instate_t const asXtalkInStateZeros;
85 79 static xtalk_instate_t const asXtalkInStateTest =
86 80 { 0xFF80, 0x0080, 0xFFFF, 0x0001 };
87   -static xtalk_state_t const asXtalkOutStateZeros = {
88   - {0, 0, 0, 0},
89   - {0, 0, 0, 0},
90   - {0, 0, 0, 0},
91   - {0, 0, 0, 0},
92   - {0, 0, 0, 0}
93   -};
  81 +static xtalk_state_t const asXtalkOutStateZeros;
  82 +
94 83 static short const sDiamondKLeftEq = 0x401d;
95 84 static short const sDiamondKRightEq = 0x401d;
96 85 static short const sDiamondKLeftXt = 0xF90E;
... ... @@ -162,13 +151,7 @@
162 151 {0, 0, 0, 0, 0}
163 152 };
164 153  
165   -static xtalk_coefs_t const asXtalkCoefsZeros = {
166   - {0, 0, 0, 0, 0},
167   - {0, 0, 0, 0, 0},
168   - {0, 0, 0, 0, 0},
169   - {0, 0, 0, 0, 0},
170   - {0, 0, 0, 0, 0}
171   -};
  154 +static xtalk_coefs_t const asXtalkCoefsZeros;
172 155 static xtalk_coefs_t const asXtalkCoefsPipe = {
173 156 {0, 0, 0x0FA0, 0, 0},
174 157 {0, 0, 0x0FA0, 0, 0},
... ... @@ -44,7 +44,7 @@
44 44 static int index[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -2}; /* Exclude the first card */
45 45 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
46 46 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
47   -static int digital_rate[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 0 }; /* digital input rate */
  47 +static int digital_rate[SNDRV_CARDS]; /* digital input rate */
48 48 static int load_all; /* allow to load the non-whitelisted cards */
49 49  
50 50 module_param_array(index, int, NULL, 0444);
sound/pci/cs46xx/cs46xx.c
Diff comments   View file @ 6581f4e
... ... @@ -48,8 +48,8 @@
48 48 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
49 49 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
50 50 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
51   -static int external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
52   -static int thinkpad[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
  51 +static int external_amp[SNDRV_CARDS];
  52 +static int thinkpad[SNDRV_CARDS];
53 53 static int mmap_valid[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
54 54  
55 55 module_param_array(index, int, NULL, 0444);
sound/pci/emu10k1/emu10k1.c
Diff comments   View file @ 6581f4e
... ... @@ -46,13 +46,13 @@
46 46 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
47 47 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
48 48 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
49   -static int extin[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
50   -static int extout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
  49 +static int extin[SNDRV_CARDS];
  50 +static int extout[SNDRV_CARDS];
51 51 static int seq_ports[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
52 52 static int max_synth_voices[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 64};
53 53 static int max_buffer_size[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 128};
54   -static int enable_ir[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
55   -static uint subsystem[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0}; /* Force card subsystem model */
  54 +static int enable_ir[SNDRV_CARDS];
  55 +static uint subsystem[SNDRV_CARDS]; /* Force card subsystem model */
56 56  
57 57 module_param_array(index, int, NULL, 0444);
58 58 MODULE_PARM_DESC(index, "Index value for the EMU10K1 soundcard.");
... ... @@ -132,7 +132,7 @@
132 132 static int total_bufsize[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1024 };
133 133 static int pcm_substreams_p[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4 };
134 134 static int pcm_substreams_c[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1 };
135   -static int clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
  135 +static int clock[SNDRV_CARDS];
136 136 static int use_pm[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
137 137 static int enable_mpu[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
138 138 #ifdef SUPPORT_JOYSTICK
... ... @@ -56,7 +56,7 @@
56 56 * 3 = MediaForte 64-PCR
57 57 * High 16-bits are video (radio) device number + 1
58 58 */
59   -static int tea575x_tuner[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 0 };
  59 +static int tea575x_tuner[SNDRV_CARDS];
60 60  
61 61 module_param_array(index, int, NULL, 0444);
62 62 MODULE_PARM_DESC(index, "Index value for the FM801 soundcard.");
sound/pci/intel8x0.c
Diff comments   View file @ 6581f4e
... ... @@ -66,7 +66,7 @@
66 66  
67 67 static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
68 68 static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */
69   -static int ac97_clock = 0;
  69 +static int ac97_clock;
70 70 static char *ac97_quirk;
71 71 static int buggy_semaphore;
72 72 static int buggy_irq = -1; /* auto-check */
sound/pci/intel8x0m.c
Diff comments   View file @ 6581f4e
... ... @@ -59,7 +59,7 @@
59 59  
60 60 static int index = -2; /* Exclude the first card */
61 61 static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */
62   -static int ac97_clock = 0;
  62 +static int ac97_clock;
63 63  
64 64 module_param(index, int, 0444);
65 65 MODULE_PARM_DESC(index, "Index value for Intel i8x0 modemcard.");
sound/pci/rme9652/rme9652.c
Diff comments   View file @ 6581f4e
... ... @@ -41,7 +41,7 @@
41 41 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
42 42 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
43 43 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
44   -static int precise_ptr[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 0 }; /* Enable precise pointer */
  44 +static int precise_ptr[SNDRV_CARDS]; /* Enable precise pointer */
45 45  
46 46 module_param_array(index, int, NULL, 0444);
47 47 MODULE_PARM_DESC(index, "Index value for RME Digi9652 (Hammerfall) soundcard.");
sound/pci/sonicvibes.c
Diff comments   View file @ 6581f4e
... ... @@ -54,8 +54,8 @@
54 54 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
55 55 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
56 56 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
57   -static int reverb[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
58   -static int mge[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
  57 +static int reverb[SNDRV_CARDS];
  58 +static int mge[SNDRV_CARDS];
59 59 static unsigned int dmaio = 0x7a00; /* DDMA i/o address */
60 60  
61 61 module_param_array(index, int, NULL, 0444);
... ... @@ -92,7 +92,7 @@
92 92 #define D_USR (1<<4)
93 93 #define D_DESC (1<<5)
94 94  
95   -static int dbri_debug = 0;
  95 +static int dbri_debug;
96 96 module_param(dbri_debug, int, 0644);
97 97 MODULE_PARM_DESC(dbri_debug, "Debug value for Sun DBRI soundcard.");
98 98  
... ... @@ -593,7 +593,7 @@
593 593 /* Return a pointer to dbri_streaminfo */
594 594 #define DBRI_STREAM(dbri, substream) &dbri->stream_info[DBRI_STREAMNO(substream)]
595 595  
596   -static struct snd_dbri *dbri_list = NULL; /* All DBRI devices */
  596 +static struct snd_dbri *dbri_list; /* All DBRI devices */
597 597  
598 598 /*
599 599 * Short data pipes transmit LSB first. The CS4215 receives MSB first. Grrr.