Revert "UBUNTU: SAUCE: (no-up) PM report driver and device suspend/resume times."

This reverts commit a697247abbe8799e17d326c2a22f035322a2ce41.

Signed-off-by: John Rigby <john.rigby@linaro.org>

2 files changed, 0 insertions, 34 deletions

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 1cd76916804..9aa618acfe9 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -192,12 +192,4 @@ config DMA_SHARED_BUFFER
 	  APIs extension; the file's descriptor can then be passed on to other
 	  driver.
 
-config SR_REPORT_TIME_LIMIT
-       int "Default low threshold"
-       depends on PM
-       default 100
-       help
-         Print suspend/resume information for driver/device for time greater
-         then default msec, ie 100 msec.
-
 endmenu
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 3b97a067512..b462c0e341c 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -352,24 +352,6 @@ static void pm_dev_err(struct device *dev, pm_message_t state, char *info,
 		dev_name(dev), pm_verb(state.event), info, error);
 }
 
-static void device_show_time(struct device *dev, ktime_t starttime, pm_message_t state, char *info)
-{
-	ktime_t calltime;
-	s64 usecs64;
-	int usecs;
-
-	calltime = ktime_get();
-	usecs64 = ktime_to_ns(ktime_sub(calltime, starttime));
-	do_div(usecs64, NSEC_PER_USEC);
-	usecs = usecs64;
-	if (usecs == 0)
-		usecs = 1;
-	if ((usecs / USEC_PER_MSEC) > CONFIG_SR_REPORT_TIME_LIMIT)
-		pr_info("PM: %s%s%s of drv:%s dev:%s complete after %ld.%03ld msecs\n", info ?: "", info ? " " : "", pm_verb(state.event),
-		dev_driver_string(dev), dev_name(dev), usecs / USEC_PER_MSEC,
-		usecs % USEC_PER_MSEC);
-}
-
 static void dpm_show_time(ktime_t starttime, pm_message_t state, char *info)
 {
 	ktime_t calltime;
@@ -422,7 +404,6 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
 	pm_callback_t callback = NULL;
 	char *info = NULL;
 	int error = 0;
-	ktime_t starttime = ktime_get();
 
 	TRACE_DEVICE(dev);
 	TRACE_RESUME(0);
@@ -430,7 +411,6 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
 	if (dev->pm_domain) {
 		info = "noirq power domain ";
 		callback = pm_noirq_op(&dev->pm_domain->ops, state);
-		device_show_time(dev, starttime, state, "early");
 	} else if (dev->type && dev->type->pm) {
 		info = "noirq type ";
 		callback = pm_noirq_op(dev->type->pm, state);
@@ -585,7 +565,6 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
 	char *info = NULL;
 	int error = 0;
 	bool put = false;
-	ktime_t starttime = ktime_get();
 
 	TRACE_DEVICE(dev);
 	TRACE_RESUME(0);
@@ -646,7 +625,6 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
 		callback = pm_op(dev->driver->pm, state);
 	}
 
-	device_show_time(dev, starttime, state, NULL);
  End:
 	error = dpm_run_callback(callback, dev, state, info);
 	dev->power.is_suspended = false;
@@ -854,7 +832,6 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
 {
 	pm_callback_t callback = NULL;
 	char *info = NULL;
-	ktime_t starttime = ktime_get();
 
 	if (dev->pm_domain) {
 		info = "noirq power domain ";
@@ -868,7 +845,6 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
 	} else if (dev->bus && dev->bus->pm) {
 		info = "noirq bus ";
 		callback = pm_noirq_op(dev->bus->pm, state);
-		device_show_time(dev, starttime, state, "late");
 	}
 
 	if (!callback && dev->driver && dev->driver->pm) {
@@ -1041,7 +1017,6 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 	pm_callback_t callback = NULL;
 	char *info = NULL;
 	int error = 0;
-	ktime_t starttime = ktime_get();
 
 	dpm_wait_for_children(dev, async);
 
@@ -1103,7 +1078,6 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 
 	error = dpm_run_callback(callback, dev, state, info);
 
-	device_show_time(dev, starttime, state, NULL);
  End:
 	if (!error) {
 		dev->power.is_suspended = true;