| Message ID | 20200129184448.3005-1-ranjani.sridharan@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: uapi: Fix sparse warning | expand |
On Wed, 29 Jan 2020 19:44:48 +0100, Ranjani Sridharan wrote: > > Fix the following sparse warning generated due to > 64-bit compat type having fields defined explicitly > with __32: > sound/soc/sof/sof-audio.c:46:31: warning: incorrect type in assignment (different base types) > sound/soc/sof/sof-audio.c:46:31: expected restricted snd_pcm_state_t [usertype] state > sound/soc/sof/sof-audio.c:46:31: got signed int [usertype] state > > Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Suggested-by: Takashi Iwai <tiwai@suse.de> > Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Thanks, applied. Takashi
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 30ebb2a42983..535a7229e1d9 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -564,13 +564,13 @@ typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)]; #endif struct __snd_pcm_mmap_status64 { - __s32 state; /* RO: state - SNDRV_PCM_STATE_XXXX */ + snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */ __u32 pad1; /* Needed for 64 bit alignment */ __pad_before_uframe __pad1; snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */ __pad_after_uframe __pad2; struct __snd_timespec64 tstamp; /* Timestamp */ - __s32 suspended_state; /* RO: suspended stream state */ + snd_pcm_state_t suspended_state;/* RO: suspended stream state */ __u32 pad3; /* Needed for 64 bit alignment */ struct __snd_timespec64 audio_tstamp; /* sample counter or wall clock */ };
Fix the following sparse warning generated due to 64-bit compat type having fields defined explicitly with __32: sound/soc/sof/sof-audio.c:46:31: warning: incorrect type in assignment (different base types) sound/soc/sof/sof-audio.c:46:31: expected restricted snd_pcm_state_t [usertype] state sound/soc/sof/sof-audio.c:46:31: got signed int [usertype] state Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Suggested-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> --- include/uapi/sound/asound.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)