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 */ 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