ASoC: omap-mcbsp: Move out the FIFO check from set_threshold and get_delay

Check if the McBSP have FIFO in the omap_mcbsp_set_threshold() and
omap_mcbsp_dai_delay() delay function to skip calling the lower layer if
it is not needed.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 7ff22561f00fcebf752f8e31513736183e9e9176..b19168f5c110ac74a9f9a2ccfa90b266e7a356d1 100644 (file)
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -450,9 +450,6 @@ int omap_st_is_enabled(struct omap_mcbsp *mcbsp)
  */
 void omap_mcbsp_set_tx_threshold(struct omap_mcbsp *mcbsp, u16 threshold)
 {
-       if (mcbsp->pdata->buffer_size == 0)
-               return;
-
        if (threshold && threshold <= mcbsp->max_tx_thres)
                MCBSP_WRITE(mcbsp, THRSH2, threshold - 1);
 }
@@ -464,9 +461,6 @@ void omap_mcbsp_set_tx_threshold(struct omap_mcbsp *mcbsp, u16 threshold)
  */
 void omap_mcbsp_set_rx_threshold(struct omap_mcbsp *mcbsp, u16 threshold)
 {
-       if (mcbsp->pdata->buffer_size == 0)
-               return;
-
        if (threshold && threshold <= mcbsp->max_rx_thres)
                MCBSP_WRITE(mcbsp, THRSH1, threshold - 1);
 }
@@ -478,9 +472,6 @@ u16 omap_mcbsp_get_tx_delay(struct omap_mcbsp *mcbsp)
 {
        u16 buffstat;
 
-       if (mcbsp->pdata->buffer_size == 0)
-               return 0;
-
        /* Returns the number of free locations in the buffer */
        buffstat = MCBSP_READ(mcbsp, XBUFFSTAT);
 
@@ -496,9 +487,6 @@ u16 omap_mcbsp_get_rx_delay(struct omap_mcbsp *mcbsp)
 {
        u16 buffstat, threshold;
 
-       if (mcbsp->pdata->buffer_size == 0)
-               return 0;
-
        /* Returns the number of used locations in the buffer */
        buffstat = MCBSP_READ(mcbsp, RBUFFSTAT);
        /* RX threshold */

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index a18b7ecc3a2e747c9ee5984ff091ae76f8474117..69a6b8ad6d429cb6265f7144c1173292ef61ab29 100644 (file)
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -71,6 +71,10 @@ static void omap_mcbsp_set_threshold(struct snd_pcm_substream *substream,
        struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
        int words;
 
+       /* No need to proceed further if McBSP does not have FIFO */
+       if (mcbsp->pdata->buffer_size == 0)
+               return;
+
        /*
         * Configure McBSP threshold based on either:
         * packet_size, when the sDMA is in packet mode, or based on the
@@ -233,6 +237,10 @@ static snd_pcm_sframes_t omap_mcbsp_dai_delay(
        u16 fifo_use;
        snd_pcm_sframes_t delay;
 
+       /* No need to proceed further if McBSP does not have FIFO */
+       if (mcbsp->pdata->buffer_size == 0)
+               return 0;
+
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                fifo_use = omap_mcbsp_get_tx_delay(mcbsp);
        else