diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-06-16 10:15:24 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-06-16 10:19:03 -0400 |
commit | 9c8ddd105e3a420b1fe2e0a4c4767b9dd67081a9 (patch) | |
tree | b92efdfa4867dffd8dc728d1293d0aae1f520851 /sound/core | |
parent | 602d7d72c8255f80898e94562f777635efd1ddaf (diff) |
ALSA: seq: Follow standard EXPORT_SYMBOL() declarations
Just a tidy up to follow the standard EXPORT_SYMBOL*() declarations
in order to improve grep-ability.
- Move EXPORT_SYMBOL*() to the position right after its definition
- Remove superfluous blank line before EXPORT_SYMBOL*() lines
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/seq/seq_clientmgr.c | 8 | ||||
-rw-r--r-- | sound/core/seq/seq_lock.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_memory.c | 2 | ||||
-rw-r--r-- | sound/core/seq/seq_midi_emul.c | 9 | ||||
-rw-r--r-- | sound/core/seq/seq_midi_event.c | 21 | ||||
-rw-r--r-- | sound/core/seq/seq_ports.c | 2 | ||||
-rw-r--r-- | sound/core/seq/seq_virmidi.c | 3 |
7 files changed, 13 insertions, 33 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index f3b1d7f50b81..272c55fe17c8 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c | |||
@@ -1668,7 +1668,6 @@ int snd_seq_set_queue_tempo(int client, struct snd_seq_queue_tempo *tempo) | |||
1668 | return -EPERM; | 1668 | return -EPERM; |
1669 | return snd_seq_queue_timer_set_tempo(tempo->queue, client, tempo); | 1669 | return snd_seq_queue_timer_set_tempo(tempo->queue, client, tempo); |
1670 | } | 1670 | } |
1671 | |||
1672 | EXPORT_SYMBOL(snd_seq_set_queue_tempo); | 1671 | EXPORT_SYMBOL(snd_seq_set_queue_tempo); |
1673 | 1672 | ||
1674 | static int snd_seq_ioctl_set_queue_tempo(struct snd_seq_client *client, | 1673 | static int snd_seq_ioctl_set_queue_tempo(struct snd_seq_client *client, |
@@ -2200,7 +2199,6 @@ int snd_seq_create_kernel_client(struct snd_card *card, int client_index, | |||
2200 | /* return client number to caller */ | 2199 | /* return client number to caller */ |
2201 | return client->number; | 2200 | return client->number; |
2202 | } | 2201 | } |
2203 | |||
2204 | EXPORT_SYMBOL(snd_seq_create_kernel_client); | 2202 | EXPORT_SYMBOL(snd_seq_create_kernel_client); |
2205 | 2203 | ||
2206 | /* exported to kernel modules */ | 2204 | /* exported to kernel modules */ |
@@ -2219,7 +2217,6 @@ int snd_seq_delete_kernel_client(int client) | |||
2219 | kfree(ptr); | 2217 | kfree(ptr); |
2220 | return 0; | 2218 | return 0; |
2221 | } | 2219 | } |
2222 | |||
2223 | EXPORT_SYMBOL(snd_seq_delete_kernel_client); | 2220 | EXPORT_SYMBOL(snd_seq_delete_kernel_client); |
2224 | 2221 | ||
2225 | /* skeleton to enqueue event, called from snd_seq_kernel_client_enqueue | 2222 | /* skeleton to enqueue event, called from snd_seq_kernel_client_enqueue |
@@ -2269,7 +2266,6 @@ int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event * ev, | |||
2269 | { | 2266 | { |
2270 | return kernel_client_enqueue(client, ev, NULL, 0, atomic, hop); | 2267 | return kernel_client_enqueue(client, ev, NULL, 0, atomic, hop); |
2271 | } | 2268 | } |
2272 | |||
2273 | EXPORT_SYMBOL(snd_seq_kernel_client_enqueue); | 2269 | EXPORT_SYMBOL(snd_seq_kernel_client_enqueue); |
2274 | 2270 | ||
2275 | /* | 2271 | /* |
@@ -2283,7 +2279,6 @@ int snd_seq_kernel_client_enqueue_blocking(int client, struct snd_seq_event * ev | |||
2283 | { | 2279 | { |
2284 | return kernel_client_enqueue(client, ev, file, 1, atomic, hop); | 2280 | return kernel_client_enqueue(client, ev, file, 1, atomic, hop); |
2285 | } | 2281 | } |
2286 | |||
2287 | EXPORT_SYMBOL(snd_seq_kernel_client_enqueue_blocking); | 2282 | EXPORT_SYMBOL(snd_seq_kernel_client_enqueue_blocking); |
2288 | 2283 | ||
2289 | /* | 2284 | /* |
@@ -2321,7 +2316,6 @@ int snd_seq_kernel_client_dispatch(int client, struct snd_seq_event * ev, | |||
2321 | snd_seq_client_unlock(cptr); | 2316 | snd_seq_client_unlock(cptr); |
2322 | return result; | 2317 | return result; |
2323 | } | 2318 | } |
2324 | |||
2325 | EXPORT_SYMBOL(snd_seq_kernel_client_dispatch); | 2319 | EXPORT_SYMBOL(snd_seq_kernel_client_dispatch); |
2326 | 2320 | ||
2327 | /** | 2321 | /** |
@@ -2354,7 +2348,6 @@ int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg) | |||
2354 | cmd, _IOC_TYPE(cmd), _IOC_NR(cmd)); | 2348 | cmd, _IOC_TYPE(cmd), _IOC_NR(cmd)); |
2355 | return -ENOTTY; | 2349 | return -ENOTTY; |
2356 | } | 2350 | } |
2357 | |||
2358 | EXPORT_SYMBOL(snd_seq_kernel_client_ctl); | 2351 | EXPORT_SYMBOL(snd_seq_kernel_client_ctl); |
2359 | 2352 | ||
2360 | /* exported (for OSS emulator) */ | 2353 | /* exported (for OSS emulator) */ |
@@ -2372,7 +2365,6 @@ int snd_seq_kernel_client_write_poll(int clientid, struct file *file, poll_table | |||
2372 | return 1; | 2365 | return 1; |
2373 | return 0; | 2366 | return 0; |
2374 | } | 2367 | } |
2375 | |||
2376 | EXPORT_SYMBOL(snd_seq_kernel_client_write_poll); | 2368 | EXPORT_SYMBOL(snd_seq_kernel_client_write_poll); |
2377 | 2369 | ||
2378 | /*---------------------------------------------------------------------------*/ | 2370 | /*---------------------------------------------------------------------------*/ |
diff --git a/sound/core/seq/seq_lock.c b/sound/core/seq/seq_lock.c index 12ba83367b1b..0ff7926a5a69 100644 --- a/sound/core/seq/seq_lock.c +++ b/sound/core/seq/seq_lock.c | |||
@@ -40,7 +40,6 @@ void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line) | |||
40 | schedule_timeout_uninterruptible(1); | 40 | schedule_timeout_uninterruptible(1); |
41 | } | 41 | } |
42 | } | 42 | } |
43 | |||
44 | EXPORT_SYMBOL(snd_use_lock_sync_helper); | 43 | EXPORT_SYMBOL(snd_use_lock_sync_helper); |
45 | 44 | ||
46 | #endif | 45 | #endif |
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index d4c61ec9be13..512f78ea13da 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c | |||
@@ -118,7 +118,6 @@ int snd_seq_dump_var_event(const struct snd_seq_event *event, | |||
118 | } | 118 | } |
119 | return 0; | 119 | return 0; |
120 | } | 120 | } |
121 | |||
122 | EXPORT_SYMBOL(snd_seq_dump_var_event); | 121 | EXPORT_SYMBOL(snd_seq_dump_var_event); |
123 | 122 | ||
124 | 123 | ||
@@ -169,7 +168,6 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char | |||
169 | &buf); | 168 | &buf); |
170 | return err < 0 ? err : newlen; | 169 | return err < 0 ? err : newlen; |
171 | } | 170 | } |
172 | |||
173 | EXPORT_SYMBOL(snd_seq_expand_var_event); | 171 | EXPORT_SYMBOL(snd_seq_expand_var_event); |
174 | 172 | ||
175 | /* | 173 | /* |
diff --git a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c index 7ba937399ac7..9e2912e3e80f 100644 --- a/sound/core/seq/seq_midi_emul.c +++ b/sound/core/seq/seq_midi_emul.c | |||
@@ -236,6 +236,7 @@ snd_midi_process_event(struct snd_midi_op *ops, | |||
236 | break; | 236 | break; |
237 | } | 237 | } |
238 | } | 238 | } |
239 | EXPORT_SYMBOL(snd_midi_process_event); | ||
239 | 240 | ||
240 | 241 | ||
241 | /* | 242 | /* |
@@ -409,6 +410,7 @@ snd_midi_channel_set_clear(struct snd_midi_channel_set *chset) | |||
409 | chan->drum_channel = 0; | 410 | chan->drum_channel = 0; |
410 | } | 411 | } |
411 | } | 412 | } |
413 | EXPORT_SYMBOL(snd_midi_channel_set_clear); | ||
412 | 414 | ||
413 | /* | 415 | /* |
414 | * Process a rpn message. | 416 | * Process a rpn message. |
@@ -701,6 +703,7 @@ struct snd_midi_channel_set *snd_midi_channel_alloc_set(int n) | |||
701 | } | 703 | } |
702 | return chset; | 704 | return chset; |
703 | } | 705 | } |
706 | EXPORT_SYMBOL(snd_midi_channel_alloc_set); | ||
704 | 707 | ||
705 | /* | 708 | /* |
706 | * Reset the midi controllers on a particular channel to default values. | 709 | * Reset the midi controllers on a particular channel to default values. |
@@ -724,6 +727,7 @@ void snd_midi_channel_free_set(struct snd_midi_channel_set *chset) | |||
724 | kfree(chset->channels); | 727 | kfree(chset->channels); |
725 | kfree(chset); | 728 | kfree(chset); |
726 | } | 729 | } |
730 | EXPORT_SYMBOL(snd_midi_channel_free_set); | ||
727 | 731 | ||
728 | static int __init alsa_seq_midi_emul_init(void) | 732 | static int __init alsa_seq_midi_emul_init(void) |
729 | { | 733 | { |
@@ -736,8 +740,3 @@ static void __exit alsa_seq_midi_emul_exit(void) | |||
736 | 740 | ||
737 | module_init(alsa_seq_midi_emul_init) | 741 | module_init(alsa_seq_midi_emul_init) |
738 | module_exit(alsa_seq_midi_emul_exit) | 742 | module_exit(alsa_seq_midi_emul_exit) |
739 | |||
740 | EXPORT_SYMBOL(snd_midi_process_event); | ||
741 | EXPORT_SYMBOL(snd_midi_channel_set_clear); | ||
742 | EXPORT_SYMBOL(snd_midi_channel_alloc_set); | ||
743 | EXPORT_SYMBOL(snd_midi_channel_free_set); | ||
diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c index 37db7ba492a6..90bbbdbeba03 100644 --- a/sound/core/seq/seq_midi_event.c +++ b/sound/core/seq/seq_midi_event.c | |||
@@ -134,6 +134,7 @@ int snd_midi_event_new(int bufsize, struct snd_midi_event **rdev) | |||
134 | *rdev = dev; | 134 | *rdev = dev; |
135 | return 0; | 135 | return 0; |
136 | } | 136 | } |
137 | EXPORT_SYMBOL(snd_midi_event_new); | ||
137 | 138 | ||
138 | void snd_midi_event_free(struct snd_midi_event *dev) | 139 | void snd_midi_event_free(struct snd_midi_event *dev) |
139 | { | 140 | { |
@@ -142,6 +143,7 @@ void snd_midi_event_free(struct snd_midi_event *dev) | |||
142 | kfree(dev); | 143 | kfree(dev); |
143 | } | 144 | } |
144 | } | 145 | } |
146 | EXPORT_SYMBOL(snd_midi_event_free); | ||
145 | 147 | ||
146 | /* | 148 | /* |
147 | * initialize record | 149 | * initialize record |
@@ -161,6 +163,7 @@ void snd_midi_event_reset_encode(struct snd_midi_event *dev) | |||
161 | reset_encode(dev); | 163 | reset_encode(dev); |
162 | spin_unlock_irqrestore(&dev->lock, flags); | 164 | spin_unlock_irqrestore(&dev->lock, flags); |
163 | } | 165 | } |
166 | EXPORT_SYMBOL(snd_midi_event_reset_encode); | ||
164 | 167 | ||
165 | void snd_midi_event_reset_decode(struct snd_midi_event *dev) | 168 | void snd_midi_event_reset_decode(struct snd_midi_event *dev) |
166 | { | 169 | { |
@@ -170,6 +173,7 @@ void snd_midi_event_reset_decode(struct snd_midi_event *dev) | |||
170 | dev->lastcmd = 0xff; | 173 | dev->lastcmd = 0xff; |
171 | spin_unlock_irqrestore(&dev->lock, flags); | 174 | spin_unlock_irqrestore(&dev->lock, flags); |
172 | } | 175 | } |
176 | EXPORT_SYMBOL(snd_midi_event_reset_decode); | ||
173 | 177 | ||
174 | #if 0 | 178 | #if 0 |
175 | void snd_midi_event_init(struct snd_midi_event *dev) | 179 | void snd_midi_event_init(struct snd_midi_event *dev) |
@@ -183,6 +187,7 @@ void snd_midi_event_no_status(struct snd_midi_event *dev, int on) | |||
183 | { | 187 | { |
184 | dev->nostat = on ? 1 : 0; | 188 | dev->nostat = on ? 1 : 0; |
185 | } | 189 | } |
190 | EXPORT_SYMBOL(snd_midi_event_no_status); | ||
186 | 191 | ||
187 | /* | 192 | /* |
188 | * resize buffer | 193 | * resize buffer |
@@ -232,6 +237,7 @@ long snd_midi_event_encode(struct snd_midi_event *dev, unsigned char *buf, long | |||
232 | 237 | ||
233 | return result; | 238 | return result; |
234 | } | 239 | } |
240 | EXPORT_SYMBOL(snd_midi_event_encode); | ||
235 | 241 | ||
236 | /* | 242 | /* |
237 | * read one byte and encode to sequencer event: | 243 | * read one byte and encode to sequencer event: |
@@ -307,6 +313,7 @@ int snd_midi_event_encode_byte(struct snd_midi_event *dev, int c, | |||
307 | spin_unlock_irqrestore(&dev->lock, flags); | 313 | spin_unlock_irqrestore(&dev->lock, flags); |
308 | return rc; | 314 | return rc; |
309 | } | 315 | } |
316 | EXPORT_SYMBOL(snd_midi_event_encode_byte); | ||
310 | 317 | ||
311 | /* encode note event */ | 318 | /* encode note event */ |
312 | static void note_event(struct snd_midi_event *dev, struct snd_seq_event *ev) | 319 | static void note_event(struct snd_midi_event *dev, struct snd_seq_event *ev) |
@@ -408,6 +415,7 @@ long snd_midi_event_decode(struct snd_midi_event *dev, unsigned char *buf, long | |||
408 | return qlen; | 415 | return qlen; |
409 | } | 416 | } |
410 | } | 417 | } |
418 | EXPORT_SYMBOL(snd_midi_event_decode); | ||
411 | 419 | ||
412 | 420 | ||
413 | /* decode note event */ | 421 | /* decode note event */ |
@@ -524,19 +532,6 @@ static int extra_decode_xrpn(struct snd_midi_event *dev, unsigned char *buf, | |||
524 | return idx; | 532 | return idx; |
525 | } | 533 | } |
526 | 534 | ||
527 | /* | ||
528 | * exports | ||
529 | */ | ||
530 | |||
531 | EXPORT_SYMBOL(snd_midi_event_new); | ||
532 | EXPORT_SYMBOL(snd_midi_event_free); | ||
533 | EXPORT_SYMBOL(snd_midi_event_reset_encode); | ||
534 | EXPORT_SYMBOL(snd_midi_event_reset_decode); | ||
535 | EXPORT_SYMBOL(snd_midi_event_no_status); | ||
536 | EXPORT_SYMBOL(snd_midi_event_encode); | ||
537 | EXPORT_SYMBOL(snd_midi_event_encode_byte); | ||
538 | EXPORT_SYMBOL(snd_midi_event_decode); | ||
539 | |||
540 | static int __init alsa_seq_midi_event_init(void) | 535 | static int __init alsa_seq_midi_event_init(void) |
541 | { | 536 | { |
542 | return 0; | 537 | return 0; |
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c index fe686ee41c6d..0a7020c82bfc 100644 --- a/sound/core/seq/seq_ports.c +++ b/sound/core/seq/seq_ports.c | |||
@@ -685,7 +685,6 @@ int snd_seq_event_port_attach(int client, | |||
685 | 685 | ||
686 | return ret; | 686 | return ret; |
687 | } | 687 | } |
688 | |||
689 | EXPORT_SYMBOL(snd_seq_event_port_attach); | 688 | EXPORT_SYMBOL(snd_seq_event_port_attach); |
690 | 689 | ||
691 | /* | 690 | /* |
@@ -706,5 +705,4 @@ int snd_seq_event_port_detach(int client, int port) | |||
706 | 705 | ||
707 | return err; | 706 | return err; |
708 | } | 707 | } |
709 | |||
710 | EXPORT_SYMBOL(snd_seq_event_port_detach); | 708 | EXPORT_SYMBOL(snd_seq_event_port_detach); |
diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c index 52f31f1498f9..8d93a4021c78 100644 --- a/sound/core/seq/seq_virmidi.c +++ b/sound/core/seq/seq_virmidi.c | |||
@@ -534,6 +534,7 @@ int snd_virmidi_new(struct snd_card *card, int device, struct snd_rawmidi **rrmi | |||
534 | *rrmidi = rmidi; | 534 | *rrmidi = rmidi; |
535 | return 0; | 535 | return 0; |
536 | } | 536 | } |
537 | EXPORT_SYMBOL(snd_virmidi_new); | ||
537 | 538 | ||
538 | /* | 539 | /* |
539 | * ENTRY functions | 540 | * ENTRY functions |
@@ -550,5 +551,3 @@ static void __exit alsa_virmidi_exit(void) | |||
550 | 551 | ||
551 | module_init(alsa_virmidi_init) | 552 | module_init(alsa_virmidi_init) |
552 | module_exit(alsa_virmidi_exit) | 553 | module_exit(alsa_virmidi_exit) |
553 | |||
554 | EXPORT_SYMBOL(snd_virmidi_new); | ||