Skip to content

Commit

Permalink
ASoC: snd_soc_[un]register_dai[s]() become non global function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Mar 26, 2013
1 parent 42277bd commit f53179c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
8 changes: 0 additions & 8 deletions include/sound/soc-dai.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,6 @@ struct snd_soc_dai_driver;
struct snd_soc_dai;
struct snd_ac97_bus_ops;

/* Digital Audio Interface registration */
int snd_soc_register_dai(struct device *dev,
struct snd_soc_dai_driver *dai_drv);
void snd_soc_unregister_dai(struct device *dev);
int snd_soc_register_dais(struct device *dev,
struct snd_soc_dai_driver *dai_drv, size_t count);
void snd_soc_unregister_dais(struct device *dev, size_t count);

/* Digital Audio Interface clocking API.*/
int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,
unsigned int freq, int dir);
Expand Down
12 changes: 4 additions & 8 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3739,7 +3739,7 @@ static inline char *fmt_multiple_name(struct device *dev,
*
* @dai: DAI to register
*/
int snd_soc_register_dai(struct device *dev,
static int snd_soc_register_dai(struct device *dev,
struct snd_soc_dai_driver *dai_drv)
{
struct snd_soc_codec *codec;
Expand Down Expand Up @@ -3786,14 +3786,13 @@ int snd_soc_register_dai(struct device *dev,

return 0;
}
EXPORT_SYMBOL_GPL(snd_soc_register_dai);

/**
* snd_soc_unregister_dai - Unregister a DAI from the ASoC core
*
* @dai: DAI to unregister
*/
void snd_soc_unregister_dai(struct device *dev)
static void snd_soc_unregister_dai(struct device *dev)
{
struct snd_soc_dai *dai;

Expand All @@ -3812,15 +3811,14 @@ void snd_soc_unregister_dai(struct device *dev)
kfree(dai->name);
kfree(dai);
}
EXPORT_SYMBOL_GPL(snd_soc_unregister_dai);

/**
* snd_soc_register_dais - Register multiple DAIs with the ASoC core
*
* @dai: Array of DAIs to register
* @count: Number of DAIs
*/
int snd_soc_register_dais(struct device *dev,
static int snd_soc_register_dais(struct device *dev,
struct snd_soc_dai_driver *dai_drv, size_t count)
{
struct snd_soc_codec *codec;
Expand Down Expand Up @@ -3884,22 +3882,20 @@ int snd_soc_register_dais(struct device *dev,

return ret;
}
EXPORT_SYMBOL_GPL(snd_soc_register_dais);

/**
* snd_soc_unregister_dais - Unregister multiple DAIs from the ASoC core
*
* @dai: Array of DAIs to unregister
* @count: Number of DAIs
*/
void snd_soc_unregister_dais(struct device *dev, size_t count)
static void snd_soc_unregister_dais(struct device *dev, size_t count)
{
int i;

for (i = 0; i < count; i++)
snd_soc_unregister_dai(dev);
}
EXPORT_SYMBOL_GPL(snd_soc_unregister_dais);

/**
* snd_soc_register_platform - Register a platform with the ASoC core
Expand Down

0 comments on commit f53179c

Please sign in to comment.