coresight: always use stashed trace id value in etm4_trace_id

[mirror_ubuntu-zesty-kernel.git] / drivers / hwtracing / coresight / coresight-etm4x.c

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index 1a5e0d14c1dd4d3fc1b876d8ff8fd1dd07c6c61c..17e2e81d2e908dca15d26149500da65fdbf53485 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -79,22 +79,8 @@ static int etm4_cpu_id(struct coresight_device *csdev)
 static int etm4_trace_id(struct coresight_device *csdev)
 {
        struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
-       unsigned long flags;
-       int trace_id = -1;
 
-       if (!local_read(&drvdata->mode))
-               return drvdata->trcid;
-
-       spin_lock_irqsave(&drvdata->spinlock, flags);
-
-       CS_UNLOCK(drvdata->base);
-       trace_id = readl_relaxed(drvdata->base + TRCTRACEIDR);
-       trace_id &= ETM_TRACEID_MASK;
-       CS_LOCK(drvdata->base);
-
-       spin_unlock_irqrestore(&drvdata->spinlock, flags);
-
-       return trace_id;
+       return drvdata->trcid;
 }
 
 static void etm4_enable_hw(void *info)