Commit 35f80014 authored by Takashi Iwai's avatar Takashi Iwai

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 98856392
...@@ -652,7 +652,6 @@ int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len) ...@@ -652,7 +652,6 @@ int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len)
*line = '\0'; *line = '\0';
return 0; return 0;
} }
EXPORT_SYMBOL(snd_info_get_line); EXPORT_SYMBOL(snd_info_get_line);
/** /**
...@@ -690,7 +689,6 @@ const char *snd_info_get_str(char *dest, const char *src, int len) ...@@ -690,7 +689,6 @@ const char *snd_info_get_str(char *dest, const char *src, int len)
src++; src++;
return src; return src;
} }
EXPORT_SYMBOL(snd_info_get_str); EXPORT_SYMBOL(snd_info_get_str);
/* /*
...@@ -748,7 +746,6 @@ struct snd_info_entry *snd_info_create_module_entry(struct module * module, ...@@ -748,7 +746,6 @@ struct snd_info_entry *snd_info_create_module_entry(struct module * module,
entry->module = module; entry->module = module;
return entry; return entry;
} }
EXPORT_SYMBOL(snd_info_create_module_entry); EXPORT_SYMBOL(snd_info_create_module_entry);
/** /**
...@@ -772,7 +769,6 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card, ...@@ -772,7 +769,6 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card,
} }
return entry; return entry;
} }
EXPORT_SYMBOL(snd_info_create_card_entry); EXPORT_SYMBOL(snd_info_create_card_entry);
static void snd_info_disconnect(struct snd_info_entry *entry) 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,7 +811,6 @@ void snd_info_free_entry(struct snd_info_entry * entry)
entry->private_free(entry); entry->private_free(entry);
kfree(entry); kfree(entry);
} }
EXPORT_SYMBOL(snd_info_free_entry); EXPORT_SYMBOL(snd_info_free_entry);
/** /**
...@@ -858,7 +853,6 @@ int snd_info_register(struct snd_info_entry * entry) ...@@ -858,7 +853,6 @@ int snd_info_register(struct snd_info_entry * entry)
mutex_unlock(&info_mutex); mutex_unlock(&info_mutex);
return 0; return 0;
} }
EXPORT_SYMBOL(snd_info_register); EXPORT_SYMBOL(snd_info_register);
/* /*
......
...@@ -61,7 +61,6 @@ int snd_oss_info_register(int dev, int num, char *string) ...@@ -61,7 +61,6 @@ int snd_oss_info_register(int dev, int num, char *string)
mutex_unlock(&strings); mutex_unlock(&strings);
return 0; return 0;
} }
EXPORT_SYMBOL(snd_oss_info_register); EXPORT_SYMBOL(snd_oss_info_register);
static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev) static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev)
......
...@@ -452,7 +452,6 @@ int snd_card_disconnect(struct snd_card *card) ...@@ -452,7 +452,6 @@ int snd_card_disconnect(struct snd_card *card)
#endif #endif
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_disconnect); EXPORT_SYMBOL(snd_card_disconnect);
static int snd_card_do_free(struct snd_card *card) 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,7 +717,7 @@ int snd_card_add_dev_attr(struct snd_card *card,
dev_err(card->dev, "Too many groups assigned\n"); dev_err(card->dev, "Too many groups assigned\n");
return -ENOSPC; return -ENOSPC;
}; }
EXPORT_SYMBOL_GPL(snd_card_add_dev_attr); EXPORT_SYMBOL_GPL(snd_card_add_dev_attr);
/** /**
...@@ -775,7 +774,6 @@ int snd_card_register(struct snd_card *card) ...@@ -775,7 +774,6 @@ int snd_card_register(struct snd_card *card)
#endif #endif
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_register); EXPORT_SYMBOL(snd_card_register);
#ifdef CONFIG_SND_PROC_FS #ifdef CONFIG_SND_PROC_FS
...@@ -895,7 +893,6 @@ int snd_component_add(struct snd_card *card, const char *component) ...@@ -895,7 +893,6 @@ int snd_component_add(struct snd_card *card, const char *component)
strcat(card->components, component); strcat(card->components, component);
return 0; return 0;
} }
EXPORT_SYMBOL(snd_component_add); EXPORT_SYMBOL(snd_component_add);
/** /**
...@@ -930,7 +927,6 @@ int snd_card_file_add(struct snd_card *card, struct file *file) ...@@ -930,7 +927,6 @@ int snd_card_file_add(struct snd_card *card, struct file *file)
spin_unlock(&card->files_lock); spin_unlock(&card->files_lock);
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_file_add); EXPORT_SYMBOL(snd_card_file_add);
/** /**
...@@ -972,7 +968,6 @@ int snd_card_file_remove(struct snd_card *card, struct file *file) ...@@ -972,7 +968,6 @@ int snd_card_file_remove(struct snd_card *card, struct file *file)
put_device(&card->card_dev); put_device(&card->card_dev);
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_file_remove); EXPORT_SYMBOL(snd_card_file_remove);
#ifdef CONFIG_PM #ifdef CONFIG_PM
...@@ -1012,6 +1007,5 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state) ...@@ -1012,6 +1007,5 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state)
remove_wait_queue(&card->power_sleep, &wait); remove_wait_queue(&card->power_sleep, &wait);
return result; return result;
} }
EXPORT_SYMBOL(snd_power_wait); EXPORT_SYMBOL(snd_power_wait);
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
...@@ -55,7 +55,6 @@ void snd_dma_program(unsigned long dma, ...@@ -55,7 +55,6 @@ void snd_dma_program(unsigned long dma,
enable_dma(dma); enable_dma(dma);
release_dma_lock(flags); release_dma_lock(flags);
} }
EXPORT_SYMBOL(snd_dma_program); EXPORT_SYMBOL(snd_dma_program);
/** /**
...@@ -73,7 +72,6 @@ void snd_dma_disable(unsigned long dma) ...@@ -73,7 +72,6 @@ void snd_dma_disable(unsigned long dma)
disable_dma(dma); disable_dma(dma);
release_dma_lock(flags); release_dma_lock(flags);
} }
EXPORT_SYMBOL(snd_dma_disable); EXPORT_SYMBOL(snd_dma_disable);
/** /**
...@@ -113,5 +111,4 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size) ...@@ -113,5 +111,4 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)
else else
return size - result; return size - result;
} }
EXPORT_SYMBOL(snd_dma_pointer); EXPORT_SYMBOL(snd_dma_pointer);
...@@ -54,6 +54,7 @@ void *snd_malloc_pages(size_t size, gfp_t gfp_flags) ...@@ -54,6 +54,7 @@ void *snd_malloc_pages(size_t size, gfp_t gfp_flags)
pg = get_order(size); pg = get_order(size);
return (void *) __get_free_pages(gfp_flags, pg); return (void *) __get_free_pages(gfp_flags, pg);
} }
EXPORT_SYMBOL(snd_malloc_pages);
/** /**
* snd_free_pages - release the pages * snd_free_pages - release the pages
...@@ -71,6 +72,7 @@ void snd_free_pages(void *ptr, size_t size) ...@@ -71,6 +72,7 @@ void snd_free_pages(void *ptr, size_t size)
pg = get_order(size); pg = get_order(size);
free_pages((unsigned long) ptr, pg); free_pages((unsigned long) ptr, pg);
} }
EXPORT_SYMBOL(snd_free_pages);
/* /*
* *
...@@ -217,6 +219,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, ...@@ -217,6 +219,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
dmab->bytes = size; dmab->bytes = size;
return 0; return 0;
} }
EXPORT_SYMBOL(snd_dma_alloc_pages);
/** /**
* snd_dma_alloc_pages_fallback - allocate the buffer area according to the given type with fallback * 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,6 +257,7 @@ int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size,
return -ENOMEM; return -ENOMEM;
return 0; return 0;
} }
EXPORT_SYMBOL(snd_dma_alloc_pages_fallback);
/** /**
...@@ -287,13 +291,4 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab) ...@@ -287,13 +291,4 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)
pr_err("snd-malloc: invalid device type %d\n", dmab->dev.type); pr_err("snd-malloc: invalid device type %d\n", dmab->dev.type);
} }
} }
/*
* exports
*/
EXPORT_SYMBOL(snd_dma_alloc_pages);
EXPORT_SYMBOL(snd_dma_alloc_pages_fallback);
EXPORT_SYMBOL(snd_dma_free_pages); EXPORT_SYMBOL(snd_dma_free_pages);
EXPORT_SYMBOL(snd_malloc_pages);
EXPORT_SYMBOL(snd_free_pages);
...@@ -55,7 +55,6 @@ int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size ...@@ -55,7 +55,6 @@ int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size
return 0; return 0;
#endif #endif
} }
EXPORT_SYMBOL(copy_to_user_fromio); EXPORT_SYMBOL(copy_to_user_fromio);
/** /**
...@@ -88,5 +87,4 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size ...@@ -88,5 +87,4 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size
return 0; return 0;
#endif #endif
} }
EXPORT_SYMBOL(copy_from_user_toio); EXPORT_SYMBOL(copy_from_user_toio);
...@@ -48,7 +48,6 @@ void release_and_free_resource(struct resource *res) ...@@ -48,7 +48,6 @@ void release_and_free_resource(struct resource *res)
kfree(res); kfree(res);
} }
} }
EXPORT_SYMBOL(release_and_free_resource); EXPORT_SYMBOL(release_and_free_resource);
#ifdef CONFIG_SND_VERBOSE_PRINTK #ifdef CONFIG_SND_VERBOSE_PRINTK
......
...@@ -395,6 +395,7 @@ int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned l ...@@ -395,6 +395,7 @@ int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned l
fmixer.mixer = card->mixer_oss; fmixer.mixer = card->mixer_oss;
return snd_mixer_oss_ioctl1(&fmixer, cmd, arg); return snd_mixer_oss_ioctl1(&fmixer, cmd, arg);
} }
EXPORT_SYMBOL(snd_mixer_oss_ioctl_card);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
/* all compatible */ /* all compatible */
...@@ -1425,5 +1426,3 @@ static void __exit alsa_mixer_oss_exit(void) ...@@ -1425,5 +1426,3 @@ static void __exit alsa_mixer_oss_exit(void)
module_init(alsa_mixer_oss_init) module_init(alsa_mixer_oss_init)
module_exit(alsa_mixer_oss_exit) module_exit(alsa_mixer_oss_exit)
EXPORT_SYMBOL(snd_mixer_oss_ioctl_card);
...@@ -74,7 +74,6 @@ void snd_request_card(int card) ...@@ -74,7 +74,6 @@ void snd_request_card(int card)
return; return;
request_module("snd-card-%i", card); request_module("snd-card-%i", card);
} }
EXPORT_SYMBOL(snd_request_card); EXPORT_SYMBOL(snd_request_card);
static void snd_request_other(int minor) static void snd_request_other(int minor)
...@@ -124,7 +123,6 @@ void *snd_lookup_minor_data(unsigned int minor, int type) ...@@ -124,7 +123,6 @@ void *snd_lookup_minor_data(unsigned int minor, int type)
mutex_unlock(&sound_mutex); mutex_unlock(&sound_mutex);
return private_data; return private_data;
} }
EXPORT_SYMBOL(snd_lookup_minor_data); EXPORT_SYMBOL(snd_lookup_minor_data);
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
......
...@@ -55,7 +55,6 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type) ...@@ -55,7 +55,6 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type)
mutex_unlock(&sound_oss_mutex); mutex_unlock(&sound_oss_mutex);
return private_data; return private_data;
} }
EXPORT_SYMBOL(snd_lookup_oss_minor_data); EXPORT_SYMBOL(snd_lookup_oss_minor_data);
static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev) 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,7 +158,6 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev,
kfree(preg); kfree(preg);
return -EBUSY; return -EBUSY;
} }
EXPORT_SYMBOL(snd_register_oss_device); EXPORT_SYMBOL(snd_register_oss_device);
int snd_unregister_oss_device(int type, struct snd_card *card, int dev) 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,7 +198,6 @@ int snd_unregister_oss_device(int type, struct snd_card *card, int dev)
kfree(mptr); kfree(mptr);
return 0; return 0;
} }
EXPORT_SYMBOL(snd_unregister_oss_device); EXPORT_SYMBOL(snd_unregister_oss_device);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment