The following commit has been merged into the timers/core branch of tip: Commit-ID: b3266ed85f77047a9674100f0da8058750e5bc62 Gitweb: https://git.kernel.org/tip/b3266ed85f77047a9674100f0da8058750e5bc62 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Mon, 13 May 2024 16:08:07 +05:30 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Mon, 03 Jun 2024 11:18:50 +02:00 ALSA: hda: Remove convert_art_to_tsc() The core code now provides a mechanism to convert the ART base clock to the corresponding TSC value without requiring an architecture specific function. Replace the direct conversion by filling in the required data. No functional change intended. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Lakshmi Sowjanya D <lakshmi.sowjanya.d@xxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20240513103813.5666-7-lakshmi.sowjanya.d@xxxxxxxxx --- sound/pci/hda/hda_controller.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 766734d..5d86e5a 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -463,7 +463,8 @@ static int azx_get_sync_time(ktime_t *device, *device = ktime_add_ns(*device, (wallclk_cycles * NSEC_PER_SEC) / ((HDA_MAX_CYCLE_VALUE + 1) * runtime->rate)); - *system = convert_art_to_tsc(tsc_counter); + system->cycles = tsc_counter; + system->cs_id = CSID_X86_ART; return 0; }