From 7a29b4ad58501dfee26b7d69e5ee4409dd34277d Mon Sep 17 00:00:00 2001
From: Varun Wadekar <vwadekar@nvidia.com>
Date: Thu, 24 Oct 2013 16:06:32 +0530
Subject: security: tf_driver: remove tegra_read_cycle()

Tegra kernel now implements this function in a common place.

Bug 1389113

Change-Id: I22f6448760fb10b4588f02d4d4b2b4fa76de8f90
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/303291
---
 security/tf_driver/tf_device.c |  5 ++---
 security/tf_driver/tf_util.c   | 13 -------------
 security/tf_driver/tf_util.h   |  6 ------
 3 files changed, 2 insertions(+), 22 deletions(-)

(limited to 'security')

diff --git a/security/tf_driver/tf_device.c b/security/tf_driver/tf_device.c
index 51dbb37dbdec..9db0a41a6fde 100644
--- a/security/tf_driver/tf_device.c
+++ b/security/tf_driver/tf_device.c
@@ -33,6 +33,8 @@
 #include <linux/device.h>
 #endif
 
+#include <trace/events/nvsecurity.h>
+
 #include "tf_protocol.h"
 #include "tf_defs.h"
 #include "tf_util.h"
@@ -48,9 +50,6 @@
 
 #include "s_version.h"
 
-#define CREATE_TRACE_POINTS
-#include <trace/events/nvsecurity.h>
-
 /*----------------------------------------------------------------------------
  * Forward Declarations
  *----------------------------------------------------------------------------*/
diff --git a/security/tf_driver/tf_util.c b/security/tf_driver/tf_util.c
index bc7b19b83f6e..b5b24497e138 100644
--- a/security/tf_driver/tf_util.c
+++ b/security/tf_driver/tf_util.c
@@ -22,19 +22,6 @@
 #include <linux/mman.h>
 #include "tf_util.h"
 
-/*----------------------------------------------------------------------------
- * Tegra-specific routines
- *----------------------------------------------------------------------------*/
-
-u32 notrace tegra_read_cycle(void)
-{
-	u32 cycle_count;
-
-	asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(cycle_count));
-
-	return cycle_count;
-}
-
 /*----------------------------------------------------------------------------
  * Debug printing routines
  *----------------------------------------------------------------------------*/
diff --git a/security/tf_driver/tf_util.h b/security/tf_driver/tf_util.h
index 972aa7259299..3b124ed9ce95 100644
--- a/security/tf_driver/tf_util.h
+++ b/security/tf_driver/tf_util.h
@@ -36,12 +36,6 @@
 #include "tf_protocol.h"
 #include "tf_defs.h"
 
-/*----------------------------------------------------------------------------
- * Tegra-specific routines
- *----------------------------------------------------------------------------*/
-
-u32 notrace tegra_read_cycle(void);
-
 /*----------------------------------------------------------------------------
  * Debug printing routines
  *----------------------------------------------------------------------------*/
-- 
cgit v1.2.3