ALSA: use ktime_get_raw_ts64() instead of getrawmonotonic64()
PATCH 1/2 ALSA: use ktime_get_raw_ts64() instead of getrawmonotonic64()
The API got renamed for consistency and the old name will be removed once the last users are gone.
--- include/sound/pcm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/sound/pcm.h +1 -1
@@ -1187,7 +1187,7 @@ static inline void snd_pcm_gettime(struct snd_pcm_runtime *runtime,ktime_get_ts64 (tv);break ;case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW : -getrawmonotonic64 (tv); +ktime_get_raw_ts64 (tv);break ;default :#ifdef CONFIG_SND_TSTAMP_REALTIME
Signature · 1 line
2.9.0
PATCH 2/2 ALSA: line6: stop using get_seconds()
The get_seconds() function is deprecated because it truncates the timestamp to 32 bits, so all users should change to ktime_get_seconds() or ktime_get_real_seconds().
The firmware interface for passing the timestamp is also limited to 32 bits, so this patch only has the cosmetic effect of avoiding the old interface.
--- sound/usb/line6/toneport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/usb/line6/toneport.c +3 -2
@@ -367,12 +367,13 @@ static bool toneport_has_source_select(struct usb_line6_toneport *toneport)*/ static void toneport_setup (struct usb_line6_toneport *toneport) { -int ticks; +u32 ticks;struct usb_line6 *line6 = &toneport->line6;struct usb_device *usbdev = line6->usbdev;/* sync time on device with host: */ - ticks = (int )get_seconds (); +/* note: 32-bit timestamps overflow in year 2106 */ + ticks = (u32 )ktime_get_real_seconds ();line6_write_data (line6,0x80c6 , &ticks,4 );/* enable device: */
Signature · 1 line
2.9.0
Quoted 5 lines · Arnd Bergmann
The API got renamed for consistency and the old name will be removed once the last users are gone.
Signed-off-by Arnd Bergmann <[email protected]>
These two fixes can be postponed for 4.19, or urgently needed for 4.18? I suppose the former, but just to be sure.
thanks,
Takashi
Quoted 21 lines
--- include/sound/pcm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/sound/pcm.h +1
-1@@ -1187,7 +1187,7 @@ static inline void snd_pcm_gettime(struct snd_pcm_runtime *runtime,ktime_get_ts64 (tv);break ;case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW : -getrawmonotonic64 (tv); +ktime_get_raw_ts64 (tv);break ;default :#ifdef CONFIG_SND_TSTAMP_REALTIME Signature · 1 line
2.9.0
Quoted 10 lines · Takashi Iwai
Quoted 5 lines · Arnd Bergmann
The API got renamed for consistency and the old name will be removed once the last users are gone.
Signed-off-by Arnd Bergmann <[email protected]>These two fixes can be postponed for 4.19, or urgently needed for 4.18? I suppose the former, but just to be sure.
Not urgent at all. I also noticed (slightly too late) that the first one doesn't even apply,
I had written it on top of my tree that contained the previously discussed API conversion, which Baolin and I still need to follow up on. I'll fold the first patch into that series, please apply just the seconds patch for 4.19 for now.
Arnd
Quoted 13 lines · Arnd Bergmann
Quoted 10 lines · Takashi Iwai
Quoted 5 lines · Arnd Bergmann
The API got renamed for consistency and the old name will be removed once the last users are gone.
Signed-off-by Arnd Bergmann <[email protected]>These two fixes can be postponed for 4.19, or urgently needed for 4.18? I suppose the former, but just to be sure.
Quoted 6 lines
Not urgent at all. I also noticed (slightly too late) that the first one doesn't even apply,
I had written it on top of my tree that contained the previously discussed API conversion, which Baolin and I still need to follow up on. I'll fold the first patch into that series, please apply just the seconds patch for 4.19 for now.
Alright, thanks.
Takashi