ALSA: pcm: Replace [audio_]tstamp_[n]sec by struct __snd_timespec in struct snd_pcm_m...

To match struct __snd_pcm_mmap_status and enable reuse of
snd_pcm_sync_ptr_get_user() and snd_pcm_sync_ptr_put_user() by
snd_pcm_sync_ptr() replace tstamp_sec and tstamp_nsec fields by
a struct __snd_timespec in struct snd_pcm_mmap_status32.
Do the same with audio_tstamp_sec and audio_tstamp_nsec.

This is possible because struct snd_pcm_mmap_status32 is packed
and __SND_STRUCT_TIME64 is always defined for kernel which means
struct __snd_timespec is always defined as:

	struct __snd_timespec {
		__s32 tv_sec;
		__s32 tv_nsec;
	};

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/df8ea1a9aff61c3e358759b1f495bdb9fb8a3e6a.1749883041.git.christophe.leroy@csgroup.eu

diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
index 17540020ac2fedcdb73a0e2c7fa6b282ffeb34b9..54eb9bd8eb218862d7a0a4769785c9ea07697163 100644 (file)
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -377,12 +377,10 @@ struct snd_pcm_mmap_status_x32 {
        s32 pad1;
        u32 hw_ptr;
        u32 pad2; /* alignment */
-       s64 tstamp_sec;
-       s64 tstamp_nsec;
+       struct __snd_timespec64 tstamp;
        snd_pcm_state_t suspended_state;
        s32 pad3;
-       s64 audio_tstamp_sec;
-       s64 audio_tstamp_nsec;
+       struct __snd_timespec64 audio_tstamp;
 } __packed;
 
 struct snd_pcm_mmap_control_x32 {

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 5eb59fdb3cb2096007b02af2567040fdfe7a037d..b7339c9ebb1f3e25ba10e480ac06741e7cffefe5 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3078,11 +3078,11 @@ failed_begin:                                                                   \
                goto failed_begin;                                              \
        unsafe_put_user(__s.state, &__src->s.status.state, failed);             \
        unsafe_put_user(__s.hw_ptr, &__src->s.status.hw_ptr, failed);           \
-       unsafe_put_user(__s.tstamp.tv_sec, &__src->s.status.tstamp_sec, failed);\
-       unsafe_put_user(__s.tstamp.tv_nsec, &__src->s.status.tstamp_nsec, failed);              \
+       unsafe_put_user(__s.tstamp.tv_sec, &__src->s.status.tstamp.tv_sec, failed);             \
+       unsafe_put_user(__s.tstamp.tv_nsec, &__src->s.status.tstamp.tv_nsec, failed);           \
        unsafe_put_user(__s.suspended_state, &__src->s.status.suspended_state, failed);         \
-       unsafe_put_user(__s.audio_tstamp.tv_sec, &__src->s.status.audio_tstamp_sec, failed);    \
-       unsafe_put_user(__s.audio_tstamp.tv_nsec, &__src->s.status.audio_tstamp_nsec, failed);  \
+       unsafe_put_user(__s.audio_tstamp.tv_sec, &__src->s.status.audio_tstamp.tv_sec, failed); \
+       unsafe_put_user(__s.audio_tstamp.tv_nsec, &__src->s.status.audio_tstamp.tv_nsec, failed);\
        unsafe_put_user(__c.appl_ptr, &__src->c.control.appl_ptr, failed);      \
        unsafe_put_user(__c.avail_min, &__src->c.control.avail_min, failed);    \
        __err = 0;                                                              \
@@ -3143,11 +3143,9 @@ struct snd_pcm_mmap_status32 {
        snd_pcm_state_t state;
        s32 pad1;
        u32 hw_ptr;
-       s32 tstamp_sec;
-       s32 tstamp_nsec;
+       struct __snd_timespec tstamp;
        snd_pcm_state_t suspended_state;
-       s32 audio_tstamp_sec;
-       s32 audio_tstamp_nsec;
+       struct __snd_timespec audio_tstamp;
 } __packed;
 
 struct snd_pcm_mmap_control32 {