]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ALSA: compress_offload: Use runtime pointer in snd_compr_poll()
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Wed, 6 Nov 2024 07:53:12 +0000 (09:53 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 6 Nov 2024 08:44:50 +0000 (09:44 +0100)
runtime is not used as seen with W=1 :
sound/core/compress_offload.c: In function ‘snd_compr_poll’:
sound/core/compress_offload.c:409:35: error: variable ‘runtime’ set but not used [-Werror=unused-but-set-variable]
  409 |         struct snd_compr_runtime *runtime;
      |                                   ^~~~~~~

Instead of dropping the runtime, use it in the function in place of
stream->runtime

Fixes: 04177158cf98 ("ALSA: compress_offload: introduce accel operation mode")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Link: https://patch.msgid.link/20241106075312.15601-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/compress_offload.c

index 5ecdad80a0d8cd3daa00dc922170e9a4dc2af1c8..86ed2fbee0c8675251c55c1515150a62d4e09cb2 100644 (file)
@@ -418,7 +418,7 @@ static __poll_t snd_compr_poll(struct file *f, poll_table *wait)
 
        guard(mutex)(&stream->device->lock);
 
-       switch (stream->runtime->state) {
+       switch (runtime->state) {
        case SNDRV_PCM_STATE_OPEN:
        case SNDRV_PCM_STATE_XRUN:
                return snd_compr_get_poll(stream) | EPOLLERR;
@@ -426,7 +426,7 @@ static __poll_t snd_compr_poll(struct file *f, poll_table *wait)
                break;
        }
 
-       poll_wait(f, &stream->runtime->sleep, wait);
+       poll_wait(f, &runtime->sleep, wait);
 
 #if IS_ENABLED(CONFIG_SND_COMPRESS_ACCEL)
        if (stream->direction == SND_COMPRESS_ACCEL) {
@@ -445,18 +445,18 @@ static __poll_t snd_compr_poll(struct file *f, poll_table *wait)
        avail = snd_compr_get_avail(stream);
        pr_debug("avail is %ld\n", (unsigned long)avail);
        /* check if we have at least one fragment to fill */
-       switch (stream->runtime->state) {
+       switch (runtime->state) {
        case SNDRV_PCM_STATE_DRAINING:
                /* stream has been woken up after drain is complete
                 * draining done so set stream state to stopped
                 */
                retval = snd_compr_get_poll(stream);
-               stream->runtime->state = SNDRV_PCM_STATE_SETUP;
+               runtime->state = SNDRV_PCM_STATE_SETUP;
                break;
        case SNDRV_PCM_STATE_RUNNING:
        case SNDRV_PCM_STATE_PREPARED:
        case SNDRV_PCM_STATE_PAUSED:
-               if (avail >= stream->runtime->fragment_size)
+               if (avail >= runtime->fragment_size)
                        retval = snd_compr_get_poll(stream);
                break;
        default: