From b2cffb57cd8ae51bc6f8817987081d3e0e76d03a Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Thu, 23 Apr 2020 08:32:00 +0800 Subject: [PATCH 1/2] Revert "ALSA: uapi: add new macro SNDRV_AUDIO_QGKI" This reverts commit dc7bb91d61ed11f6f27ad39d47e9bec3c712882e. The change has been done in userspace. This change is not needed anymore. Change-Id: Ie49a4263a2a4760e0538cee4d462654f1f8ac21f Signed-off-by: Meng Wang --- include/uapi/sound/asound.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 5edc76c022b6..47de40712c8b 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -1046,8 +1046,4 @@ struct snd_ctl_event { #define SNDRV_CTL_NAME_IEC958_PCM_STREAM "PCM Stream" #define SNDRV_CTL_NAME_IEC958(expl,direction,what) "IEC958 " expl SNDRV_CTL_NAME_##direction SNDRV_CTL_NAME_IEC958_##what -#ifdef CONFIG_AUDIO_QGKI -#define SNDRV_AUDIO_QGKI 1 -#endif - #endif /* _UAPI__SOUND_ASOUND_H */ From 6ad843ab579a0a80142078b53de3ca4c3627c7b3 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Thu, 23 Apr 2020 08:39:46 +0800 Subject: [PATCH 2/2] Revert "ASoC: msm: fix integer overflow for long duration offload playback" This reverts commit fdaacf046874989a27d96a77944344f5cb9e2164. Change-Id: Id52223e0f1af18a1427674f03d8971dff9420b77 Signed-off-by: Meng Wang --- include/uapi/sound/compress_offload.h | 4 ---- sound/core/compress_offload.c | 5 ----- 2 files changed, 9 deletions(-) diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h index d19c823259da..323f342dd1c2 100644 --- a/include/uapi/sound/compress_offload.h +++ b/include/uapi/sound/compress_offload.h @@ -67,11 +67,7 @@ struct snd_compr_params { */ struct snd_compr_tstamp { __u32 byte_offset; -#ifdef CONFIG_AUIDO_QGKI - __u64 copied_total; -#else __u32 copied_total; -#endif __u32 pcm_frames; __u32 pcm_io_frames; __u32 sampling_rate; diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index b909937ff02d..8e1fca0b682d 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -172,15 +172,10 @@ static int snd_compr_update_tstamp(struct snd_compr_stream *stream, if (!stream->ops->pointer) return -ENOTSUPP; err = stream->ops->pointer(stream, tstamp); -#ifdef CONFIG_AUDIO_QGKI if (err) return err; - pr_debug("dsp consumed till %d total %llu bytes\n", - tstamp->byte_offset, tstamp->copied_total); -#else pr_debug("dsp consumed till %d total %d bytes\n", tstamp->byte_offset, tstamp->copied_total); -#endif if (stream->direction == SND_COMPRESS_PLAYBACK) stream->runtime->total_bytes_transferred = tstamp->copied_total; else