[PATCH v2 3/4] ALSA: pcm: Replace [audio_]tstamp_[n]sec by struct __snd_timespec in struct snd_pcm_mmap_status32

[Christophe Leroy]

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.le...@csgroup.eu>
---
 sound/core/pcm_native.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index fd69eea935b2..5ba2fbc0f0f7 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3077,11 +3077,11 @@ failed:                                                 
                        \
                goto failed;                                                    
\
        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;                                                              
\
@@ -3141,11 +3141,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 {
-- 
2.47.0