aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/bcm/cygnus-pcm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/bcm/cygnus-pcm.c b/sound/soc/bcm/cygnus-pcm.c
index 123ecf5479d7..8966b02844dc 100644
--- a/sound/soc/bcm/cygnus-pcm.c
+++ b/sound/soc/bcm/cygnus-pcm.c
@@ -639,7 +639,6 @@ static int cygnus_pcm_hw_params(struct snd_pcm_substream *substream,
639 struct snd_soc_pcm_runtime *rtd = substream->private_data; 639 struct snd_soc_pcm_runtime *rtd = substream->private_data;
640 struct snd_pcm_runtime *runtime = substream->runtime; 640 struct snd_pcm_runtime *runtime = substream->runtime;
641 struct cygnus_aio_port *aio; 641 struct cygnus_aio_port *aio;
642 int ret = 0;
643 642
644 aio = cygnus_dai_get_dma_data(substream); 643 aio = cygnus_dai_get_dma_data(substream);
645 dev_dbg(rtd->cpu_dai->dev, "%s port %d\n", __func__, aio->portnum); 644 dev_dbg(rtd->cpu_dai->dev, "%s port %d\n", __func__, aio->portnum);
@@ -647,7 +646,7 @@ static int cygnus_pcm_hw_params(struct snd_pcm_substream *substream,
647 snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); 646 snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
648 runtime->dma_bytes = params_buffer_bytes(params); 647 runtime->dma_bytes = params_buffer_bytes(params);
649 648
650 return ret; 649 return 0;
651} 650}
652 651
653static int cygnus_pcm_hw_free(struct snd_pcm_substream *substream) 652static int cygnus_pcm_hw_free(struct snd_pcm_substream *substream)
@@ -668,7 +667,6 @@ static int cygnus_pcm_prepare(struct snd_pcm_substream *substream)
668 struct snd_pcm_runtime *runtime = substream->runtime; 667 struct snd_pcm_runtime *runtime = substream->runtime;
669 struct cygnus_aio_port *aio; 668 struct cygnus_aio_port *aio;
670 unsigned long bufsize, periodsize; 669 unsigned long bufsize, periodsize;
671 int ret = 0;
672 bool is_play; 670 bool is_play;
673 u32 start; 671 u32 start;
674 struct ringbuf_regs *p_rbuf = NULL; 672 struct ringbuf_regs *p_rbuf = NULL;
@@ -693,7 +691,7 @@ static int cygnus_pcm_prepare(struct snd_pcm_substream *substream)
693 ringbuf_set_initial(aio->cygaud->audio, p_rbuf, is_play, start, 691 ringbuf_set_initial(aio->cygaud->audio, p_rbuf, is_play, start,
694 periodsize, bufsize); 692 periodsize, bufsize);
695 693
696 return ret; 694 return 0;
697} 695}
698 696
699static snd_pcm_uframes_t cygnus_pcm_pointer(struct snd_pcm_substream *substream) 697static snd_pcm_uframes_t cygnus_pcm_pointer(struct snd_pcm_substream *substream)