diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:38:30 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:57:54 -0400 |
commit | f53179c026b11bef674d75154f5ea47ca3248ca9 (patch) | |
tree | 57a559ff978f9fab86f08a5e2a9140f96a896fe3 /sound/soc/soc-core.c | |
parent | 42277bddc6ad7ab31ad51411578e3e0d8d168963 (diff) |
ASoC: snd_soc_[un]register_dai[s]() become non global function
All drivers are using snd_soc_register_component()
instead of snd_soc_register_dai[s]()
snd_soc_[un]register_dai[s]() are no longer needed
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2ecaaf13e319..f6cda7b6ce44 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -3739,7 +3739,7 @@ static inline char *fmt_multiple_name(struct device *dev, | |||
3739 | * | 3739 | * |
3740 | * @dai: DAI to register | 3740 | * @dai: DAI to register |
3741 | */ | 3741 | */ |
3742 | int snd_soc_register_dai(struct device *dev, | 3742 | static int snd_soc_register_dai(struct device *dev, |
3743 | struct snd_soc_dai_driver *dai_drv) | 3743 | struct snd_soc_dai_driver *dai_drv) |
3744 | { | 3744 | { |
3745 | struct snd_soc_codec *codec; | 3745 | struct snd_soc_codec *codec; |
@@ -3786,14 +3786,13 @@ int snd_soc_register_dai(struct device *dev, | |||
3786 | 3786 | ||
3787 | return 0; | 3787 | return 0; |
3788 | } | 3788 | } |
3789 | EXPORT_SYMBOL_GPL(snd_soc_register_dai); | ||
3790 | 3789 | ||
3791 | /** | 3790 | /** |
3792 | * snd_soc_unregister_dai - Unregister a DAI from the ASoC core | 3791 | * snd_soc_unregister_dai - Unregister a DAI from the ASoC core |
3793 | * | 3792 | * |
3794 | * @dai: DAI to unregister | 3793 | * @dai: DAI to unregister |
3795 | */ | 3794 | */ |
3796 | void snd_soc_unregister_dai(struct device *dev) | 3795 | static void snd_soc_unregister_dai(struct device *dev) |
3797 | { | 3796 | { |
3798 | struct snd_soc_dai *dai; | 3797 | struct snd_soc_dai *dai; |
3799 | 3798 | ||
@@ -3812,7 +3811,6 @@ found: | |||
3812 | kfree(dai->name); | 3811 | kfree(dai->name); |
3813 | kfree(dai); | 3812 | kfree(dai); |
3814 | } | 3813 | } |
3815 | EXPORT_SYMBOL_GPL(snd_soc_unregister_dai); | ||
3816 | 3814 | ||
3817 | /** | 3815 | /** |
3818 | * snd_soc_register_dais - Register multiple DAIs with the ASoC core | 3816 | * snd_soc_register_dais - Register multiple DAIs with the ASoC core |
@@ -3820,7 +3818,7 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dai); | |||
3820 | * @dai: Array of DAIs to register | 3818 | * @dai: Array of DAIs to register |
3821 | * @count: Number of DAIs | 3819 | * @count: Number of DAIs |
3822 | */ | 3820 | */ |
3823 | int snd_soc_register_dais(struct device *dev, | 3821 | static int snd_soc_register_dais(struct device *dev, |
3824 | struct snd_soc_dai_driver *dai_drv, size_t count) | 3822 | struct snd_soc_dai_driver *dai_drv, size_t count) |
3825 | { | 3823 | { |
3826 | struct snd_soc_codec *codec; | 3824 | struct snd_soc_codec *codec; |
@@ -3884,7 +3882,6 @@ err: | |||
3884 | 3882 | ||
3885 | return ret; | 3883 | return ret; |
3886 | } | 3884 | } |
3887 | EXPORT_SYMBOL_GPL(snd_soc_register_dais); | ||
3888 | 3885 | ||
3889 | /** | 3886 | /** |
3890 | * snd_soc_unregister_dais - Unregister multiple DAIs from the ASoC core | 3887 | * snd_soc_unregister_dais - Unregister multiple DAIs from the ASoC core |
@@ -3892,14 +3889,13 @@ EXPORT_SYMBOL_GPL(snd_soc_register_dais); | |||
3892 | * @dai: Array of DAIs to unregister | 3889 | * @dai: Array of DAIs to unregister |
3893 | * @count: Number of DAIs | 3890 | * @count: Number of DAIs |
3894 | */ | 3891 | */ |
3895 | void snd_soc_unregister_dais(struct device *dev, size_t count) | 3892 | static void snd_soc_unregister_dais(struct device *dev, size_t count) |
3896 | { | 3893 | { |
3897 | int i; | 3894 | int i; |
3898 | 3895 | ||
3899 | for (i = 0; i < count; i++) | 3896 | for (i = 0; i < count; i++) |
3900 | snd_soc_unregister_dai(dev); | 3897 | snd_soc_unregister_dai(dev); |
3901 | } | 3898 | } |
3902 | EXPORT_SYMBOL_GPL(snd_soc_unregister_dais); | ||
3903 | 3899 | ||
3904 | /** | 3900 | /** |
3905 | * snd_soc_register_platform - Register a platform with the ASoC core | 3901 | * snd_soc_register_platform - Register a platform with the ASoC core |