From 466c29da791913e7631b38d26cc9b79da7632810 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 18 Jun 2018 14:53:14 -0400 Subject: [PATCH] Fix: ASoC level IO tracing removed upstream Removed in v3.16. See upstream commits: Author: Lars-Peter Clausen Date: Tue Apr 22 13:23:17 2014 +0200 ASoC: Remove ASoC level IO tracing The ASoC framework is in the process of migrating all IO operations to regmap. regmap has its own more sophisticated tracing infrastructure for IO operations, which means that the ASoC level IO tracing becomes redundant, hence this patch removes them. There are still a handful of ASoC drivers left that do not use regmap yet, but hopefully the removal of the ASoC IO tracing will be an additional incentive to switch to regmap. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- instrumentation/events/lttng-module/asoc.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h index 25136ec0..7eee0359 100644 --- a/instrumentation/events/lttng-module/asoc.h +++ b/instrumentation/events/lttng-module/asoc.h @@ -14,7 +14,8 @@ #define _TRACE_ASOC_DEF struct snd_soc_jack; struct snd_soc_codec; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \ + LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) struct snd_soc_platform; #endif struct snd_soc_card; @@ -30,6 +31,7 @@ struct snd_soc_dapm_widget; #define CODEC_ID_FIELD id #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) /* * Log register events */ @@ -69,8 +71,10 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_reg, snd_soc_reg_read, TP_ARGS(codec, reg, val) ) +#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \ + LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_preg, TP_PROTO(struct snd_soc_platform *platform, unsigned int reg, -- 2.34.1