diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-22 07:16:39 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-22 12:34:25 -0500 |
| commit | 354a21423d09c2a6afe0fcea9dbbda9cdada6e45 (patch) | |
| tree | b673c242dd040bbb392edaa1236783e17270ec37 | |
| parent | 204e418bd2826423f7bacc6d4e15af8b0649e149 (diff) | |
ASoC: Declare soc_new_pcm() properly
Ensure that everything is seeing the same declaration by moving it to
a header file rather than putting the declaration in soc-core.c
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
| -rw-r--r-- | include/sound/soc.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 8391b0ec217e..f75d1ccc5c58 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
| @@ -317,6 +317,7 @@ int snd_soc_platform_read(struct snd_soc_platform *platform, | |||
| 317 | unsigned int reg); | 317 | unsigned int reg); |
| 318 | int snd_soc_platform_write(struct snd_soc_platform *platform, | 318 | int snd_soc_platform_write(struct snd_soc_platform *platform, |
| 319 | unsigned int reg, unsigned int val); | 319 | unsigned int reg, unsigned int val); |
| 320 | int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num); | ||
| 320 | 321 | ||
| 321 | /* Utility functions to get clock rates from various things */ | 322 | /* Utility functions to get clock rates from various things */ |
| 322 | int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots); | 323 | int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots); |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a4592cbee49b..acbb96005a69 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -59,8 +59,6 @@ static LIST_HEAD(dai_list); | |||
| 59 | static LIST_HEAD(platform_list); | 59 | static LIST_HEAD(platform_list); |
| 60 | static LIST_HEAD(codec_list); | 60 | static LIST_HEAD(codec_list); |
| 61 | 61 | ||
| 62 | int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num); | ||
| 63 | |||
| 64 | /* | 62 | /* |
| 65 | * This is a timeout to do a DAPM powerdown after a stream is closed(). | 63 | * This is a timeout to do a DAPM powerdown after a stream is closed(). |
| 66 | * It can be used to eliminate pops between different playback streams, e.g. | 64 | * It can be used to eliminate pops between different playback streams, e.g. |
