summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-01-05 11:29:07 -0500
committerTakashi Iwai <tiwai@suse.de>2017-01-12 06:50:16 -0500
commit9021b2b8fd8f352abfc9470249eca9b36356a155 (patch)
treee64b485c5fac90494c25ce8fb39047bb149c7f3d
parentc36f486d7bc71d41ec6b9521574136a280c17803 (diff)
ALSA: isa: Constify snd_rawmidi_ops
Now snd_rawmidi_ops is maintained as a const pointer in snd_rawmidi, we can constify the definitions. Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--include/sound/snd_wavefront.h4
-rw-r--r--sound/isa/gus/gus_uart.c4
-rw-r--r--sound/isa/msnd/msnd_midi.c2
-rw-r--r--sound/isa/sb/sb8_midi.c4
-rw-r--r--sound/isa/wavefront/wavefront_midi.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/include/sound/snd_wavefront.h b/include/sound/snd_wavefront.h
index 35e94b3d1ec7..cd0bab1ef6f1 100644
--- a/include/sound/snd_wavefront.h
+++ b/include/sound/snd_wavefront.h
@@ -37,8 +37,8 @@ struct _snd_wavefront_midi {
37#define MPU_ACK 0xFE 37#define MPU_ACK 0xFE
38#define UART_MODE_ON 0x3F 38#define UART_MODE_ON 0x3F
39 39
40extern struct snd_rawmidi_ops snd_wavefront_midi_output; 40extern const struct snd_rawmidi_ops snd_wavefront_midi_output;
41extern struct snd_rawmidi_ops snd_wavefront_midi_input; 41extern const struct snd_rawmidi_ops snd_wavefront_midi_input;
42 42
43extern void snd_wavefront_midi_enable_virtual (snd_wavefront_card_t *); 43extern void snd_wavefront_midi_enable_virtual (snd_wavefront_card_t *);
44extern void snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *); 44extern void snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *);
diff --git a/sound/isa/gus/gus_uart.c b/sound/isa/gus/gus_uart.c
index 3992912743f5..ac5f5687d1a3 100644
--- a/sound/isa/gus/gus_uart.c
+++ b/sound/isa/gus/gus_uart.c
@@ -227,14 +227,14 @@ static void snd_gf1_uart_output_trigger(struct snd_rawmidi_substream *substream,
227 spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); 227 spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
228} 228}
229 229
230static struct snd_rawmidi_ops snd_gf1_uart_output = 230static const struct snd_rawmidi_ops snd_gf1_uart_output =
231{ 231{
232 .open = snd_gf1_uart_output_open, 232 .open = snd_gf1_uart_output_open,
233 .close = snd_gf1_uart_output_close, 233 .close = snd_gf1_uart_output_close,
234 .trigger = snd_gf1_uart_output_trigger, 234 .trigger = snd_gf1_uart_output_trigger,
235}; 235};
236 236
237static struct snd_rawmidi_ops snd_gf1_uart_input = 237static const struct snd_rawmidi_ops snd_gf1_uart_input =
238{ 238{
239 .open = snd_gf1_uart_input_open, 239 .open = snd_gf1_uart_input_open,
240 .close = snd_gf1_uart_input_close, 240 .close = snd_gf1_uart_input_close,
diff --git a/sound/isa/msnd/msnd_midi.c b/sound/isa/msnd/msnd_midi.c
index ffc67fd80c23..912b5a9ccbab 100644
--- a/sound/isa/msnd/msnd_midi.c
+++ b/sound/isa/msnd/msnd_midi.c
@@ -142,7 +142,7 @@ void snd_msndmidi_input_read(void *mpuv)
142} 142}
143EXPORT_SYMBOL(snd_msndmidi_input_read); 143EXPORT_SYMBOL(snd_msndmidi_input_read);
144 144
145static struct snd_rawmidi_ops snd_msndmidi_input = { 145static const struct snd_rawmidi_ops snd_msndmidi_input = {
146 .open = snd_msndmidi_input_open, 146 .open = snd_msndmidi_input_open,
147 .close = snd_msndmidi_input_close, 147 .close = snd_msndmidi_input_close,
148 .trigger = snd_msndmidi_input_trigger, 148 .trigger = snd_msndmidi_input_trigger,
diff --git a/sound/isa/sb/sb8_midi.c b/sound/isa/sb/sb8_midi.c
index d551c50e549f..bd672abb4854 100644
--- a/sound/isa/sb/sb8_midi.c
+++ b/sound/isa/sb/sb8_midi.c
@@ -247,14 +247,14 @@ static void snd_sb8dsp_midi_output_trigger(struct snd_rawmidi_substream *substre
247 snd_sb8dsp_midi_output_write(substream); 247 snd_sb8dsp_midi_output_write(substream);
248} 248}
249 249
250static struct snd_rawmidi_ops snd_sb8dsp_midi_output = 250static const struct snd_rawmidi_ops snd_sb8dsp_midi_output =
251{ 251{
252 .open = snd_sb8dsp_midi_output_open, 252 .open = snd_sb8dsp_midi_output_open,
253 .close = snd_sb8dsp_midi_output_close, 253 .close = snd_sb8dsp_midi_output_close,
254 .trigger = snd_sb8dsp_midi_output_trigger, 254 .trigger = snd_sb8dsp_midi_output_trigger,
255}; 255};
256 256
257static struct snd_rawmidi_ops snd_sb8dsp_midi_input = 257static const struct snd_rawmidi_ops snd_sb8dsp_midi_input =
258{ 258{
259 .open = snd_sb8dsp_midi_input_open, 259 .open = snd_sb8dsp_midi_input_open,
260 .close = snd_sb8dsp_midi_input_close, 260 .close = snd_sb8dsp_midi_input_close,
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c
index 8a80fc6a616b..2aa05f3aaa38 100644
--- a/sound/isa/wavefront/wavefront_midi.c
+++ b/sound/isa/wavefront/wavefront_midi.c
@@ -559,14 +559,14 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card)
559 return 0; 559 return 0;
560} 560}
561 561
562struct snd_rawmidi_ops snd_wavefront_midi_output = 562const struct snd_rawmidi_ops snd_wavefront_midi_output =
563{ 563{
564 .open = snd_wavefront_midi_output_open, 564 .open = snd_wavefront_midi_output_open,
565 .close = snd_wavefront_midi_output_close, 565 .close = snd_wavefront_midi_output_close,
566 .trigger = snd_wavefront_midi_output_trigger, 566 .trigger = snd_wavefront_midi_output_trigger,
567}; 567};
568 568
569struct snd_rawmidi_ops snd_wavefront_midi_input = 569const struct snd_rawmidi_ops snd_wavefront_midi_input =
570{ 570{
571 .open = snd_wavefront_midi_input_open, 571 .open = snd_wavefront_midi_input_open,
572 .close = snd_wavefront_midi_input_close, 572 .close = snd_wavefront_midi_input_close,