diff options
Diffstat (limited to 'sound/usb/midi.c')
-rw-r--r-- | sound/usb/midi.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c index 5b4c58c3e2c5..cc39f63299ef 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c | |||
@@ -112,7 +112,7 @@ struct snd_usb_midi { | |||
112 | struct usb_interface *iface; | 112 | struct usb_interface *iface; |
113 | const struct snd_usb_audio_quirk *quirk; | 113 | const struct snd_usb_audio_quirk *quirk; |
114 | struct snd_rawmidi *rmidi; | 114 | struct snd_rawmidi *rmidi; |
115 | struct usb_protocol_ops *usb_protocol_ops; | 115 | const struct usb_protocol_ops *usb_protocol_ops; |
116 | struct list_head list; | 116 | struct list_head list; |
117 | struct timer_list error_timer; | 117 | struct timer_list error_timer; |
118 | spinlock_t disc_lock; | 118 | spinlock_t disc_lock; |
@@ -671,31 +671,32 @@ static void snd_usbmidi_standard_output(struct snd_usb_midi_out_endpoint *ep, | |||
671 | } | 671 | } |
672 | } | 672 | } |
673 | 673 | ||
674 | static struct usb_protocol_ops snd_usbmidi_standard_ops = { | 674 | static const struct usb_protocol_ops snd_usbmidi_standard_ops = { |
675 | .input = snd_usbmidi_standard_input, | 675 | .input = snd_usbmidi_standard_input, |
676 | .output = snd_usbmidi_standard_output, | 676 | .output = snd_usbmidi_standard_output, |
677 | .output_packet = snd_usbmidi_output_standard_packet, | 677 | .output_packet = snd_usbmidi_output_standard_packet, |
678 | }; | 678 | }; |
679 | 679 | ||
680 | static struct usb_protocol_ops snd_usbmidi_midiman_ops = { | 680 | static const struct usb_protocol_ops snd_usbmidi_midiman_ops = { |
681 | .input = snd_usbmidi_midiman_input, | 681 | .input = snd_usbmidi_midiman_input, |
682 | .output = snd_usbmidi_standard_output, | 682 | .output = snd_usbmidi_standard_output, |
683 | .output_packet = snd_usbmidi_output_midiman_packet, | 683 | .output_packet = snd_usbmidi_output_midiman_packet, |
684 | }; | 684 | }; |
685 | 685 | ||
686 | static struct usb_protocol_ops snd_usbmidi_maudio_broken_running_status_ops = { | 686 | static const |
687 | struct usb_protocol_ops snd_usbmidi_maudio_broken_running_status_ops = { | ||
687 | .input = snd_usbmidi_maudio_broken_running_status_input, | 688 | .input = snd_usbmidi_maudio_broken_running_status_input, |
688 | .output = snd_usbmidi_standard_output, | 689 | .output = snd_usbmidi_standard_output, |
689 | .output_packet = snd_usbmidi_output_standard_packet, | 690 | .output_packet = snd_usbmidi_output_standard_packet, |
690 | }; | 691 | }; |
691 | 692 | ||
692 | static struct usb_protocol_ops snd_usbmidi_cme_ops = { | 693 | static const struct usb_protocol_ops snd_usbmidi_cme_ops = { |
693 | .input = snd_usbmidi_cme_input, | 694 | .input = snd_usbmidi_cme_input, |
694 | .output = snd_usbmidi_standard_output, | 695 | .output = snd_usbmidi_standard_output, |
695 | .output_packet = snd_usbmidi_output_standard_packet, | 696 | .output_packet = snd_usbmidi_output_standard_packet, |
696 | }; | 697 | }; |
697 | 698 | ||
698 | static struct usb_protocol_ops snd_usbmidi_ch345_broken_sysex_ops = { | 699 | static const struct usb_protocol_ops snd_usbmidi_ch345_broken_sysex_ops = { |
699 | .input = ch345_broken_sysex_input, | 700 | .input = ch345_broken_sysex_input, |
700 | .output = snd_usbmidi_standard_output, | 701 | .output = snd_usbmidi_standard_output, |
701 | .output_packet = snd_usbmidi_output_standard_packet, | 702 | .output_packet = snd_usbmidi_output_standard_packet, |
@@ -795,7 +796,7 @@ static void snd_usbmidi_akai_output(struct snd_usb_midi_out_endpoint *ep, | |||
795 | } | 796 | } |
796 | } | 797 | } |
797 | 798 | ||
798 | static struct usb_protocol_ops snd_usbmidi_akai_ops = { | 799 | static const struct usb_protocol_ops snd_usbmidi_akai_ops = { |
799 | .input = snd_usbmidi_akai_input, | 800 | .input = snd_usbmidi_akai_input, |
800 | .output = snd_usbmidi_akai_output, | 801 | .output = snd_usbmidi_akai_output, |
801 | }; | 802 | }; |
@@ -835,7 +836,7 @@ static void snd_usbmidi_novation_output(struct snd_usb_midi_out_endpoint *ep, | |||
835 | urb->transfer_buffer_length = 2 + count; | 836 | urb->transfer_buffer_length = 2 + count; |
836 | } | 837 | } |
837 | 838 | ||
838 | static struct usb_protocol_ops snd_usbmidi_novation_ops = { | 839 | static const struct usb_protocol_ops snd_usbmidi_novation_ops = { |
839 | .input = snd_usbmidi_novation_input, | 840 | .input = snd_usbmidi_novation_input, |
840 | .output = snd_usbmidi_novation_output, | 841 | .output = snd_usbmidi_novation_output, |
841 | }; | 842 | }; |
@@ -867,7 +868,7 @@ static void snd_usbmidi_raw_output(struct snd_usb_midi_out_endpoint *ep, | |||
867 | urb->transfer_buffer_length = count; | 868 | urb->transfer_buffer_length = count; |
868 | } | 869 | } |
869 | 870 | ||
870 | static struct usb_protocol_ops snd_usbmidi_raw_ops = { | 871 | static const struct usb_protocol_ops snd_usbmidi_raw_ops = { |
871 | .input = snd_usbmidi_raw_input, | 872 | .input = snd_usbmidi_raw_input, |
872 | .output = snd_usbmidi_raw_output, | 873 | .output = snd_usbmidi_raw_output, |
873 | }; | 874 | }; |
@@ -883,7 +884,7 @@ static void snd_usbmidi_ftdi_input(struct snd_usb_midi_in_endpoint *ep, | |||
883 | snd_usbmidi_input_data(ep, 0, buffer + 2, buffer_length - 2); | 884 | snd_usbmidi_input_data(ep, 0, buffer + 2, buffer_length - 2); |
884 | } | 885 | } |
885 | 886 | ||
886 | static struct usb_protocol_ops snd_usbmidi_ftdi_ops = { | 887 | static const struct usb_protocol_ops snd_usbmidi_ftdi_ops = { |
887 | .input = snd_usbmidi_ftdi_input, | 888 | .input = snd_usbmidi_ftdi_input, |
888 | .output = snd_usbmidi_raw_output, | 889 | .output = snd_usbmidi_raw_output, |
889 | }; | 890 | }; |
@@ -927,7 +928,7 @@ static void snd_usbmidi_us122l_output(struct snd_usb_midi_out_endpoint *ep, | |||
927 | urb->transfer_buffer_length = ep->max_transfer; | 928 | urb->transfer_buffer_length = ep->max_transfer; |
928 | } | 929 | } |
929 | 930 | ||
930 | static struct usb_protocol_ops snd_usbmidi_122l_ops = { | 931 | static const struct usb_protocol_ops snd_usbmidi_122l_ops = { |
931 | .input = snd_usbmidi_us122l_input, | 932 | .input = snd_usbmidi_us122l_input, |
932 | .output = snd_usbmidi_us122l_output, | 933 | .output = snd_usbmidi_us122l_output, |
933 | }; | 934 | }; |
@@ -1060,7 +1061,7 @@ static void snd_usbmidi_emagic_output(struct snd_usb_midi_out_endpoint *ep, | |||
1060 | urb->transfer_buffer_length = ep->max_transfer - buf_free; | 1061 | urb->transfer_buffer_length = ep->max_transfer - buf_free; |
1061 | } | 1062 | } |
1062 | 1063 | ||
1063 | static struct usb_protocol_ops snd_usbmidi_emagic_ops = { | 1064 | static const struct usb_protocol_ops snd_usbmidi_emagic_ops = { |
1064 | .input = snd_usbmidi_emagic_input, | 1065 | .input = snd_usbmidi_emagic_input, |
1065 | .output = snd_usbmidi_emagic_output, | 1066 | .output = snd_usbmidi_emagic_output, |
1066 | .init_out_endpoint = snd_usbmidi_emagic_init_out, | 1067 | .init_out_endpoint = snd_usbmidi_emagic_init_out, |
@@ -2206,7 +2207,7 @@ static int snd_usbmidi_create_endpoints_midiman(struct snd_usb_midi *umidi, | |||
2206 | return 0; | 2207 | return 0; |
2207 | } | 2208 | } |
2208 | 2209 | ||
2209 | static struct snd_rawmidi_global_ops snd_usbmidi_ops = { | 2210 | static const struct snd_rawmidi_global_ops snd_usbmidi_ops = { |
2210 | .get_port_info = snd_usbmidi_get_port_info, | 2211 | .get_port_info = snd_usbmidi_get_port_info, |
2211 | }; | 2212 | }; |
2212 | 2213 | ||