Merge tag 'fuse-update-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mszered...

[linux-2.6-microblaze.git] / sound / soc / soc-generic-dmaengine-pcm.c

diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 9ef80a4..4aa48c7 100644 (file)
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -79,7 +79,6 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,
                        struct snd_pcm_hw_params *params,
                        struct dma_slave_config *slave_config);
        struct dma_slave_config slave_config;
-       int ret;
 
        memset(&slave_config, 0, sizeof(slave_config));
 
@@ -89,7 +88,7 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,
                prepare_slave_config = pcm->config->prepare_slave_config;
 
        if (prepare_slave_config) {
-               ret = prepare_slave_config(substream, params, &slave_config);
+               int ret = prepare_slave_config(substream, params, &slave_config);
                if (ret)
                        return ret;
 
@@ -230,7 +229,6 @@ static int dmaengine_pcm_new(struct snd_soc_component *component,
        struct dmaengine_pcm *pcm = soc_component_to_pcm(component);
        const struct snd_dmaengine_pcm_config *config = pcm->config;
        struct device *dev = component->dev;
-       struct snd_pcm_substream *substream;
        size_t prealloc_buffer_size;
        size_t max_buffer_size;
        unsigned int i;
@@ -244,7 +242,7 @@ static int dmaengine_pcm_new(struct snd_soc_component *component,
        }
 
        for_each_pcm_streams(i) {
-               substream = rtd->pcm->streams[i].substream;
+               struct snd_pcm_substream *substream = rtd->pcm->streams[i].substream;
                if (!substream)
                        continue;
 
@@ -307,14 +305,13 @@ static int dmaengine_copy_user(struct snd_soc_component *component,
        bool is_playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
        void *dma_ptr = runtime->dma_area + hwoff +
                        channel * (runtime->dma_bytes / runtime->channels);
-       int ret;
 
        if (is_playback)
                if (copy_from_user(dma_ptr, buf, bytes))
                        return -EFAULT;
 
        if (process) {
-               ret = process(substream, channel, hwoff, (__force void *)buf, bytes);
+               int ret = process(substream, channel, hwoff, (__force void *)buf, bytes);
                if (ret < 0)
                        return ret;
        }