diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-06-16 10:16:33 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-06-16 10:19:16 -0400 |
commit | 35f8001415d301ba47124f463f98eee0e7d0792c (patch) | |
tree | 2494c71c0079a77268aadc0ba74ad728f19deee3 | |
parent | 988563929d5b65c021439880ac6bd1b207722f26 (diff) |
ALSA: core: 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>
-rw-r--r-- | sound/core/info.c | 6 | ||||
-rw-r--r-- | sound/core/info_oss.c | 1 | ||||
-rw-r--r-- | sound/core/init.c | 8 | ||||
-rw-r--r-- | sound/core/isadma.c | 3 | ||||
-rw-r--r-- | sound/core/memalloc.c | 13 | ||||
-rw-r--r-- | sound/core/memory.c | 2 | ||||
-rw-r--r-- | sound/core/misc.c | 1 | ||||
-rw-r--r-- | sound/core/oss/mixer_oss.c | 3 | ||||
-rw-r--r-- | sound/core/sound.c | 2 | ||||
-rw-r--r-- | sound/core/sound_oss.c | 3 |
10 files changed, 6 insertions, 36 deletions
diff --git a/sound/core/info.c b/sound/core/info.c index fc14ebe751d8..bcf6a48cc70d 100644 --- a/sound/core/info.c +++ b/sound/core/info.c | |||
@@ -652,7 +652,6 @@ int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len) | |||
652 | *line = '\0'; | 652 | *line = '\0'; |
653 | return 0; | 653 | return 0; |
654 | } | 654 | } |
655 | |||
656 | EXPORT_SYMBOL(snd_info_get_line); | 655 | EXPORT_SYMBOL(snd_info_get_line); |
657 | 656 | ||
658 | /** | 657 | /** |
@@ -690,7 +689,6 @@ const char *snd_info_get_str(char *dest, const char *src, int len) | |||
690 | src++; | 689 | src++; |
691 | return src; | 690 | return src; |
692 | } | 691 | } |
693 | |||
694 | EXPORT_SYMBOL(snd_info_get_str); | 692 | EXPORT_SYMBOL(snd_info_get_str); |
695 | 693 | ||
696 | /* | 694 | /* |
@@ -748,7 +746,6 @@ struct snd_info_entry *snd_info_create_module_entry(struct module * module, | |||
748 | entry->module = module; | 746 | entry->module = module; |
749 | return entry; | 747 | return entry; |
750 | } | 748 | } |
751 | |||
752 | EXPORT_SYMBOL(snd_info_create_module_entry); | 749 | EXPORT_SYMBOL(snd_info_create_module_entry); |
753 | 750 | ||
754 | /** | 751 | /** |
@@ -772,7 +769,6 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card, | |||
772 | } | 769 | } |
773 | return entry; | 770 | return entry; |
774 | } | 771 | } |
775 | |||
776 | EXPORT_SYMBOL(snd_info_create_card_entry); | 772 | EXPORT_SYMBOL(snd_info_create_card_entry); |
777 | 773 | ||
778 | static void snd_info_disconnect(struct snd_info_entry *entry) | 774 | static void snd_info_disconnect(struct snd_info_entry *entry) |
@@ -815,7 +811,6 @@ void snd_info_free_entry(struct snd_info_entry * entry) | |||
815 | entry->private_free(entry); | 811 | entry->private_free(entry); |
816 | kfree(entry); | 812 | kfree(entry); |
817 | } | 813 | } |
818 | |||
819 | EXPORT_SYMBOL(snd_info_free_entry); | 814 | EXPORT_SYMBOL(snd_info_free_entry); |
820 | 815 | ||
821 | /** | 816 | /** |
@@ -858,7 +853,6 @@ int snd_info_register(struct snd_info_entry * entry) | |||
858 | mutex_unlock(&info_mutex); | 853 | mutex_unlock(&info_mutex); |
859 | return 0; | 854 | return 0; |
860 | } | 855 | } |
861 | |||
862 | EXPORT_SYMBOL(snd_info_register); | 856 | EXPORT_SYMBOL(snd_info_register); |
863 | 857 | ||
864 | /* | 858 | /* |
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c index 1478c8dfd473..f479374b6bd8 100644 --- a/sound/core/info_oss.c +++ b/sound/core/info_oss.c | |||
@@ -61,7 +61,6 @@ int snd_oss_info_register(int dev, int num, char *string) | |||
61 | mutex_unlock(&strings); | 61 | mutex_unlock(&strings); |
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
64 | |||
65 | EXPORT_SYMBOL(snd_oss_info_register); | 64 | EXPORT_SYMBOL(snd_oss_info_register); |
66 | 65 | ||
67 | static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev) | 66 | static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev) |
diff --git a/sound/core/init.c b/sound/core/init.c index 6bda8436d765..00f2cbb76e69 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -452,7 +452,6 @@ int snd_card_disconnect(struct snd_card *card) | |||
452 | #endif | 452 | #endif |
453 | return 0; | 453 | return 0; |
454 | } | 454 | } |
455 | |||
456 | EXPORT_SYMBOL(snd_card_disconnect); | 455 | EXPORT_SYMBOL(snd_card_disconnect); |
457 | 456 | ||
458 | static int snd_card_do_free(struct snd_card *card) | 457 | static int snd_card_do_free(struct snd_card *card) |
@@ -718,7 +717,7 @@ int snd_card_add_dev_attr(struct snd_card *card, | |||
718 | 717 | ||
719 | dev_err(card->dev, "Too many groups assigned\n"); | 718 | dev_err(card->dev, "Too many groups assigned\n"); |
720 | return -ENOSPC; | 719 | return -ENOSPC; |
721 | }; | 720 | } |
722 | EXPORT_SYMBOL_GPL(snd_card_add_dev_attr); | 721 | EXPORT_SYMBOL_GPL(snd_card_add_dev_attr); |
723 | 722 | ||
724 | /** | 723 | /** |
@@ -775,7 +774,6 @@ int snd_card_register(struct snd_card *card) | |||
775 | #endif | 774 | #endif |
776 | return 0; | 775 | return 0; |
777 | } | 776 | } |
778 | |||
779 | EXPORT_SYMBOL(snd_card_register); | 777 | EXPORT_SYMBOL(snd_card_register); |
780 | 778 | ||
781 | #ifdef CONFIG_SND_PROC_FS | 779 | #ifdef CONFIG_SND_PROC_FS |
@@ -895,7 +893,6 @@ int snd_component_add(struct snd_card *card, const char *component) | |||
895 | strcat(card->components, component); | 893 | strcat(card->components, component); |
896 | return 0; | 894 | return 0; |
897 | } | 895 | } |
898 | |||
899 | EXPORT_SYMBOL(snd_component_add); | 896 | EXPORT_SYMBOL(snd_component_add); |
900 | 897 | ||
901 | /** | 898 | /** |
@@ -930,7 +927,6 @@ int snd_card_file_add(struct snd_card *card, struct file *file) | |||
930 | spin_unlock(&card->files_lock); | 927 | spin_unlock(&card->files_lock); |
931 | return 0; | 928 | return 0; |
932 | } | 929 | } |
933 | |||
934 | EXPORT_SYMBOL(snd_card_file_add); | 930 | EXPORT_SYMBOL(snd_card_file_add); |
935 | 931 | ||
936 | /** | 932 | /** |
@@ -972,7 +968,6 @@ int snd_card_file_remove(struct snd_card *card, struct file *file) | |||
972 | put_device(&card->card_dev); | 968 | put_device(&card->card_dev); |
973 | return 0; | 969 | return 0; |
974 | } | 970 | } |
975 | |||
976 | EXPORT_SYMBOL(snd_card_file_remove); | 971 | EXPORT_SYMBOL(snd_card_file_remove); |
977 | 972 | ||
978 | #ifdef CONFIG_PM | 973 | #ifdef CONFIG_PM |
@@ -1012,6 +1007,5 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state) | |||
1012 | remove_wait_queue(&card->power_sleep, &wait); | 1007 | remove_wait_queue(&card->power_sleep, &wait); |
1013 | return result; | 1008 | return result; |
1014 | } | 1009 | } |
1015 | |||
1016 | EXPORT_SYMBOL(snd_power_wait); | 1010 | EXPORT_SYMBOL(snd_power_wait); |
1017 | #endif /* CONFIG_PM */ | 1011 | #endif /* CONFIG_PM */ |
diff --git a/sound/core/isadma.c b/sound/core/isadma.c index 31e8544d7f2d..7a8515abb5f9 100644 --- a/sound/core/isadma.c +++ b/sound/core/isadma.c | |||
@@ -55,7 +55,6 @@ void snd_dma_program(unsigned long dma, | |||
55 | enable_dma(dma); | 55 | enable_dma(dma); |
56 | release_dma_lock(flags); | 56 | release_dma_lock(flags); |
57 | } | 57 | } |
58 | |||
59 | EXPORT_SYMBOL(snd_dma_program); | 58 | EXPORT_SYMBOL(snd_dma_program); |
60 | 59 | ||
61 | /** | 60 | /** |
@@ -73,7 +72,6 @@ void snd_dma_disable(unsigned long dma) | |||
73 | disable_dma(dma); | 72 | disable_dma(dma); |
74 | release_dma_lock(flags); | 73 | release_dma_lock(flags); |
75 | } | 74 | } |
76 | |||
77 | EXPORT_SYMBOL(snd_dma_disable); | 75 | EXPORT_SYMBOL(snd_dma_disable); |
78 | 76 | ||
79 | /** | 77 | /** |
@@ -113,5 +111,4 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size) | |||
113 | else | 111 | else |
114 | return size - result; | 112 | return size - result; |
115 | } | 113 | } |
116 | |||
117 | EXPORT_SYMBOL(snd_dma_pointer); | 114 | EXPORT_SYMBOL(snd_dma_pointer); |
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index f05cb6a8cbe0..7f89d3c79a4b 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c | |||
@@ -54,6 +54,7 @@ void *snd_malloc_pages(size_t size, gfp_t gfp_flags) | |||
54 | pg = get_order(size); | 54 | pg = get_order(size); |
55 | return (void *) __get_free_pages(gfp_flags, pg); | 55 | return (void *) __get_free_pages(gfp_flags, pg); |
56 | } | 56 | } |
57 | EXPORT_SYMBOL(snd_malloc_pages); | ||
57 | 58 | ||
58 | /** | 59 | /** |
59 | * snd_free_pages - release the pages | 60 | * snd_free_pages - release the pages |
@@ -71,6 +72,7 @@ void snd_free_pages(void *ptr, size_t size) | |||
71 | pg = get_order(size); | 72 | pg = get_order(size); |
72 | free_pages((unsigned long) ptr, pg); | 73 | free_pages((unsigned long) ptr, pg); |
73 | } | 74 | } |
75 | EXPORT_SYMBOL(snd_free_pages); | ||
74 | 76 | ||
75 | /* | 77 | /* |
76 | * | 78 | * |
@@ -217,6 +219,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, | |||
217 | dmab->bytes = size; | 219 | dmab->bytes = size; |
218 | return 0; | 220 | return 0; |
219 | } | 221 | } |
222 | EXPORT_SYMBOL(snd_dma_alloc_pages); | ||
220 | 223 | ||
221 | /** | 224 | /** |
222 | * snd_dma_alloc_pages_fallback - allocate the buffer area according to the given type with fallback | 225 | * snd_dma_alloc_pages_fallback - allocate the buffer area according to the given type with fallback |
@@ -254,6 +257,7 @@ int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size, | |||
254 | return -ENOMEM; | 257 | return -ENOMEM; |
255 | return 0; | 258 | return 0; |
256 | } | 259 | } |
260 | EXPORT_SYMBOL(snd_dma_alloc_pages_fallback); | ||
257 | 261 | ||
258 | 262 | ||
259 | /** | 263 | /** |
@@ -287,13 +291,4 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab) | |||
287 | pr_err("snd-malloc: invalid device type %d\n", dmab->dev.type); | 291 | pr_err("snd-malloc: invalid device type %d\n", dmab->dev.type); |
288 | } | 292 | } |
289 | } | 293 | } |
290 | |||
291 | /* | ||
292 | * exports | ||
293 | */ | ||
294 | EXPORT_SYMBOL(snd_dma_alloc_pages); | ||
295 | EXPORT_SYMBOL(snd_dma_alloc_pages_fallback); | ||
296 | EXPORT_SYMBOL(snd_dma_free_pages); | 294 | EXPORT_SYMBOL(snd_dma_free_pages); |
297 | |||
298 | EXPORT_SYMBOL(snd_malloc_pages); | ||
299 | EXPORT_SYMBOL(snd_free_pages); | ||
diff --git a/sound/core/memory.c b/sound/core/memory.c index 4cd664efad77..19c9ea90d9bf 100644 --- a/sound/core/memory.c +++ b/sound/core/memory.c | |||
@@ -55,7 +55,6 @@ int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size | |||
55 | return 0; | 55 | return 0; |
56 | #endif | 56 | #endif |
57 | } | 57 | } |
58 | |||
59 | EXPORT_SYMBOL(copy_to_user_fromio); | 58 | EXPORT_SYMBOL(copy_to_user_fromio); |
60 | 59 | ||
61 | /** | 60 | /** |
@@ -88,5 +87,4 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size | |||
88 | return 0; | 87 | return 0; |
89 | #endif | 88 | #endif |
90 | } | 89 | } |
91 | |||
92 | EXPORT_SYMBOL(copy_from_user_toio); | 90 | EXPORT_SYMBOL(copy_from_user_toio); |
diff --git a/sound/core/misc.c b/sound/core/misc.c index 21b228046e88..0f818d593c9e 100644 --- a/sound/core/misc.c +++ b/sound/core/misc.c | |||
@@ -48,7 +48,6 @@ void release_and_free_resource(struct resource *res) | |||
48 | kfree(res); | 48 | kfree(res); |
49 | } | 49 | } |
50 | } | 50 | } |
51 | |||
52 | EXPORT_SYMBOL(release_and_free_resource); | 51 | EXPORT_SYMBOL(release_and_free_resource); |
53 | 52 | ||
54 | #ifdef CONFIG_SND_VERBOSE_PRINTK | 53 | #ifdef CONFIG_SND_VERBOSE_PRINTK |
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c index 2ff9c12d664a..379bf486ccc7 100644 --- a/sound/core/oss/mixer_oss.c +++ b/sound/core/oss/mixer_oss.c | |||
@@ -395,6 +395,7 @@ int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned l | |||
395 | fmixer.mixer = card->mixer_oss; | 395 | fmixer.mixer = card->mixer_oss; |
396 | return snd_mixer_oss_ioctl1(&fmixer, cmd, arg); | 396 | return snd_mixer_oss_ioctl1(&fmixer, cmd, arg); |
397 | } | 397 | } |
398 | EXPORT_SYMBOL(snd_mixer_oss_ioctl_card); | ||
398 | 399 | ||
399 | #ifdef CONFIG_COMPAT | 400 | #ifdef CONFIG_COMPAT |
400 | /* all compatible */ | 401 | /* all compatible */ |
@@ -1425,5 +1426,3 @@ static void __exit alsa_mixer_oss_exit(void) | |||
1425 | 1426 | ||
1426 | module_init(alsa_mixer_oss_init) | 1427 | module_init(alsa_mixer_oss_init) |
1427 | module_exit(alsa_mixer_oss_exit) | 1428 | module_exit(alsa_mixer_oss_exit) |
1428 | |||
1429 | EXPORT_SYMBOL(snd_mixer_oss_ioctl_card); | ||
diff --git a/sound/core/sound.c b/sound/core/sound.c index 175f9e4e01c8..b30f027eb0fe 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c | |||
@@ -74,7 +74,6 @@ void snd_request_card(int card) | |||
74 | return; | 74 | return; |
75 | request_module("snd-card-%i", card); | 75 | request_module("snd-card-%i", card); |
76 | } | 76 | } |
77 | |||
78 | EXPORT_SYMBOL(snd_request_card); | 77 | EXPORT_SYMBOL(snd_request_card); |
79 | 78 | ||
80 | static void snd_request_other(int minor) | 79 | static void snd_request_other(int minor) |
@@ -124,7 +123,6 @@ void *snd_lookup_minor_data(unsigned int minor, int type) | |||
124 | mutex_unlock(&sound_mutex); | 123 | mutex_unlock(&sound_mutex); |
125 | return private_data; | 124 | return private_data; |
126 | } | 125 | } |
127 | |||
128 | EXPORT_SYMBOL(snd_lookup_minor_data); | 126 | EXPORT_SYMBOL(snd_lookup_minor_data); |
129 | 127 | ||
130 | #ifdef CONFIG_MODULES | 128 | #ifdef CONFIG_MODULES |
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c index 0ca9d72b2273..0a5c66229a22 100644 --- a/sound/core/sound_oss.c +++ b/sound/core/sound_oss.c | |||
@@ -55,7 +55,6 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type) | |||
55 | mutex_unlock(&sound_oss_mutex); | 55 | mutex_unlock(&sound_oss_mutex); |
56 | return private_data; | 56 | return private_data; |
57 | } | 57 | } |
58 | |||
59 | EXPORT_SYMBOL(snd_lookup_oss_minor_data); | 58 | EXPORT_SYMBOL(snd_lookup_oss_minor_data); |
60 | 59 | ||
61 | static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev) | 60 | static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev) |
@@ -159,7 +158,6 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev, | |||
159 | kfree(preg); | 158 | kfree(preg); |
160 | return -EBUSY; | 159 | return -EBUSY; |
161 | } | 160 | } |
162 | |||
163 | EXPORT_SYMBOL(snd_register_oss_device); | 161 | EXPORT_SYMBOL(snd_register_oss_device); |
164 | 162 | ||
165 | int snd_unregister_oss_device(int type, struct snd_card *card, int dev) | 163 | int snd_unregister_oss_device(int type, struct snd_card *card, int dev) |
@@ -200,7 +198,6 @@ int snd_unregister_oss_device(int type, struct snd_card *card, int dev) | |||
200 | kfree(mptr); | 198 | kfree(mptr); |
201 | return 0; | 199 | return 0; |
202 | } | 200 | } |
203 | |||
204 | EXPORT_SYMBOL(snd_unregister_oss_device); | 201 | EXPORT_SYMBOL(snd_unregister_oss_device); |
205 | 202 | ||
206 | /* | 203 | /* |