From 5d1ba86436821d079f07245823909bcf7a1f817f Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 18 Jun 2018 14:53:17 -0400 Subject: [PATCH] Fix: asoc: Remove snd_soc_cache_sync() implementation See upstream commit: commit 427d204c86e095bb91eb8af381bd90a48376a860 Author: Lars-Peter Clausen Date: Sat Nov 8 16:38:07 2014 +0100 ASoC: Remove snd_soc_cache_sync() implementation This function has no more non regmap user, which means we can remove the implementation of the function and associated functions and structure fields. For convenience we keep a static inline version of the function that forwards calls to regcache_sync() unconditionally. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- instrumentation/events/lttng-module/asoc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h index dd5a066a..4c5833c3 100644 --- a/instrumentation/events/lttng-module/asoc.h +++ b/instrumentation/events/lttng-module/asoc.h @@ -13,7 +13,9 @@ #ifndef _TRACE_ASOC_DEF #define _TRACE_ASOC_DEF struct snd_soc_jack; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)) struct snd_soc_codec; +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \ LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) struct snd_soc_platform; @@ -386,6 +388,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_notify, ) #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)) LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync, asoc_snd_soc_cache_sync, @@ -402,6 +405,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync, ctf_integer(int, id, codec->CODEC_ID_FIELD) ) ) +#endif #endif /* LTTNG_TRACE_ASOC_H */ -- 2.34.1