diff options
author | Jarkko Nikula <jhnikula@gmail.com> | 2009-08-23 05:24:27 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-25 05:20:48 -0400 |
commit | d09a2afc9359407114b7062519101f1ee2d05388 (patch) | |
tree | 43a4ac61d26e2c760dc2547066cef1b4d076a07f /sound/soc | |
parent | 32080af7a612e8c56131d6bdcd268cd9e8b0add1 (diff) |
ARM: OMAP: McBSP: Merge two functions into omap_mcbsp_start/_stop
Functionality of functions omap_mcbsp_xmit_enable and omap_mcbsp_recv_enable
can be merged into omap_mcbsp_start and omap_mcbsp_stop since API of
those omap_mcbsp_start and omap_mcbsp_stop was changed recently allowing
to start and stop individually the transmitter and receiver.
This cleans up the code in arch/arm/plat-omap/mcbsp.c and in
sound/soc/omap/omap-mcbsp.c which was the only user for those removed
functions.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com>
Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 89e8bce114af..0e173e7e0c3a 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -231,11 +231,6 @@ static int omap_mcbsp_dai_trigger(struct snd_pcm_substream *substream, int cmd, | |||
231 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | 231 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: |
232 | mcbsp_data->active++; | 232 | mcbsp_data->active++; |
233 | omap_mcbsp_start(mcbsp_data->bus_id, play, !play); | 233 | omap_mcbsp_start(mcbsp_data->bus_id, play, !play); |
234 | /* Make sure data transfer is frame synchronized */ | ||
235 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
236 | omap_mcbsp_xmit_enable(mcbsp_data->bus_id, 1); | ||
237 | else | ||
238 | omap_mcbsp_recv_enable(mcbsp_data->bus_id, 1); | ||
239 | break; | 234 | break; |
240 | 235 | ||
241 | case SNDRV_PCM_TRIGGER_STOP: | 236 | case SNDRV_PCM_TRIGGER_STOP: |