From: James Clark <james.clark@linaro.org>

Use the new API, coresight_etm_get_trace_id, to read the traceid of the ETM
device when call traceid_show via sysfs node.

Signed-off-by: James Clark <james.clark@linaro.org>
Signed-off-by: Jie Gan <redacted>
---
  drivers/hwtracing/coresight/coresight-etm3x-sysfs.c | 3 +--
  drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 4 ++--
  2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
index 68c644be9813..b9006451f515 100644
--- a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c

@@ -1190,10 +1190,9 @@ static DEVICE_ATTR_RO(cpu);
  static ssize_t traceid_show(struct device *dev,
  			    struct device_attribute *attr, char *buf)
  {
-	int trace_id;
  	struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent);
+	int trace_id = coresight_etm_get_trace_id(drvdata->csdev, CS_MODE_SYSFS, NULL);
  
-	trace_id = etm_read_alloc_trace_id(drvdata);
  	if (trace_id < 0)
  		return trace_id;
  

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
index c767f8ae4cf1..e5216c0f60da 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c

@@ -4,6 +4,7 @@
   * Author: Mathieu Poirier <mathieu.poirier@linaro.org>
   */
  
+#include <linux/coresight.h>
  #include <linux/pid_namespace.h>
  #include <linux/pm_runtime.h>
  #include <linux/sysfs.h>

@@ -2402,10 +2403,9 @@ static ssize_t trctraceid_show(struct device *dev,
  			       struct device_attribute *attr,
  			       char *buf)
  {
-	int trace_id;
  	struct etmv4_drvdata *drvdata = dev_get_drvdata(dev->parent);
+	int trace_id = coresight_etm_get_trace_id(drvdata->csdev, CS_MODE_SYSFS, NULL);
  
-	trace_id = etm4_read_alloc_trace_id(drvdata);
  	if (trace_id < 0)
  		return trace_id;