[1/2] ALSA: use ktime_get_raw_ts64() instead of getrawmonotonic64()
diff mbox

Message ID 20180618154108.2227779-1-arnd@arndb.de
State New
Headers show

Commit Message

Arnd Bergmann June 18, 2018, 3:41 p.m. UTC
The API got renamed for consistency and the old name will
be removed once the last users are gone.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/sound/pcm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Takashi Iwai June 18, 2018, 3:45 p.m. UTC | #1
On Mon, 18 Jun 2018 17:41:00 +0200,
Arnd Bergmann wrote:
> 
> The API got renamed for consistency and the old name will
> be removed once the last users are gone.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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

> ---
>  include/sound/pcm.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/sound/pcm.h b/include/sound/pcm.h
> index 5d5daa190b08..f566611f0fef 100644
> --- a/include/sound/pcm.h
> +++ b/include/sound/pcm.h
> @@ -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
> -- 
> 2.9.0
> 
>
Arnd Bergmann June 18, 2018, 3:52 p.m. UTC | #2
On Mon, Jun 18, 2018 at 5:45 PM, Takashi Iwai <tiwai@suse.de> wrote:
> On Mon, 18 Jun 2018 17:41:00 +0200,
> Arnd Bergmann wrote:
>>
>> The API got renamed for consistency and the old name will
>> be removed once the last users are gone.
>>
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> 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
Takashi Iwai June 18, 2018, 3:56 p.m. UTC | #3
On Mon, 18 Jun 2018 17:52:43 +0200,
Arnd Bergmann wrote:
> 
> On Mon, Jun 18, 2018 at 5:45 PM, Takashi Iwai <tiwai@suse.de> wrote:
> > On Mon, 18 Jun 2018 17:41:00 +0200,
> > Arnd Bergmann wrote:
> >>
> >> The API got renamed for consistency and the old name will
> >> be removed once the last users are gone.
> >>
> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >
> > 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.

Alright, thanks.


Takashi

Patch
diff mbox

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 5d5daa190b08..f566611f0fef 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -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