Creating the tracepoints only when tracing is enabled.
Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
---
drivers/usb/typec/tipd/Makefile | 4 +++-
drivers/usb/typec/tipd/{tps6598x.c => core.c} | 6 ++----
drivers/usb/typec/tipd/trace.c | 9 +++++++++
drivers/usb/typec/tipd/{tps6598x_trace.h => trace.h} | 2 +-
4 files changed, 15 insertions(+), 6 deletions(-)
rename drivers/usb/typec/tipd/{tps6598x.c => core.c} (99%)
create mode 100644 drivers/usb/typec/tipd/trace.c
rename drivers/usb/typec/tipd/{tps6598x_trace.h => trace.h} (99%)
diff --git a/drivers/usb/typec/tipd/Makefile b/drivers/usb/typec/tipd/Makefile
index 4c19eadb5f466..aa439f80a889e 100644
--- a/drivers/usb/typec/tipd/Makefile
+++ b/drivers/usb/typec/tipd/Makefile
@@ -1,4 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-CFLAGS_tps6598x.o := -I$(src)
+CFLAGS_trace.o := -I$(src)
obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o
+tps6598x-y := core.o
+tps6598x-$(CONFIG_TRACING) += trace.o
diff --git a/drivers/usb/typec/tipd/tps6598x.c b/drivers/usb/typec/tipd/core.c
similarity index 99%
rename from drivers/usb/typec/tipd/tps6598x.c
rename to drivers/usb/typec/tipd/core.c
index 2c4ab90e16e79..9e924db421794 100644
--- a/drivers/usb/typec/tipd/tps6598x.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -6,8 +6,6 @@
* Author: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
*/
-#include "tps6598x.h"
-
#include <linux/i2c.h>
#include <linux/acpi.h>
#include <linux/module.h>
@@ -17,8 +15,8 @@
#include <linux/usb/typec.h>
#include <linux/usb/role.h>
-#define CREATE_TRACE_POINTS
-#include "tps6598x_trace.h"
+#include "tps6598x.h"
+#include "trace.h"
/* Register offsets */
#define TPS_REG_VID 0x00
diff --git a/drivers/usb/typec/tipd/trace.c b/drivers/usb/typec/tipd/trace.c
new file mode 100644
index 0000000000000..016e68048dc24
--- /dev/null
+++ b/drivers/usb/typec/tipd/trace.c
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * TI TPS6598x USB Power Delivery Controller Trace Support
+ *
+ * Copyright (C) 2021, Intel Corporation
+ * Author: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
+ */
+#define CREATE_TRACE_POINTS
+#include "trace.h"
diff --git a/drivers/usb/typec/tipd/tps6598x_trace.h b/drivers/usb/typec/tipd/trace.h
similarity index 99%
rename from drivers/usb/typec/tipd/tps6598x_trace.h
rename to drivers/usb/typec/tipd/trace.h
index 21917751d61ee..5d09d6f789300 100644
--- a/drivers/usb/typec/tipd/tps6598x_trace.h
+++ b/drivers/usb/typec/tipd/trace.h
@@ -277,7 +277,7 @@ TRACE_EVENT(tps6598x_data_status,
/* This part must be outside protection */
#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE tps6598x_trace
+#define TRACE_INCLUDE_FILE trace
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#include <trace/define_trace.h>
--
2.30.1
