revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / base / power / main.c

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 1ba3de8015b56415b9d95113a037c5dd3c57045c..276d5a701dc37cfbebc828a88efc824abc163774 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -26,7 +26,6 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/async.h>
-#include <linux/timer.h>
 
 #include "../base.h"
 #include "power.h"
@@ -46,12 +45,6 @@ LIST_HEAD(dpm_list);
 static DEFINE_MUTEX(dpm_list_mtx);
 static pm_message_t pm_transition;
 
-static void dpm_drv_timeout(unsigned long data);
-struct dpm_drv_wd_data {
-       struct device *dev;
-       struct task_struct *tsk;
-};
-
 /*
  * Set once the preparation of devices for a PM transition has started, reset
  * before starting to resume devices.  Protected by dpm_list_mtx.
@@ -531,9 +524,7 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
        TRACE_DEVICE(dev);
        TRACE_RESUME(0);
 
-       if (dev->parent && (dev->parent->power.status >= DPM_OFF ||
-                           dev->parent->power.status == DPM_RESUMING))
-               dpm_wait(dev->parent, async);
+       dpm_wait(dev->parent, async);
        device_lock(dev);
 
        dev->power.status = DPM_RESUMING;
@@ -593,30 +584,6 @@ static bool is_async(struct device *dev)
                && !pm_trace_is_enabled();
 }
 
-/**
- *     dpm_drv_timeout - Driver suspend / resume watchdog handler
- *     @data: struct device which timed out
- *
- *     Called when a driver has timed out suspending or resuming.
- *     There's not much we can do here to recover so
- *     BUG() out for a crash-dump
- *
- */
-static void dpm_drv_timeout(unsigned long data)
-{
-       struct dpm_drv_wd_data *wd_data = (void *)data;
-       struct device *dev = wd_data->dev;
-       struct task_struct *tsk = wd_data->tsk;
-
-       printk(KERN_EMERG "**** DPM device timeout: %s (%s)\n", dev_name(dev),
-              (dev->driver ? dev->driver->name : "no driver"));
-
-       printk(KERN_EMERG "dpm suspend stack:\n");
-       show_stack(tsk, NULL);
-
-       BUG();
-}
-
 /**
  * dpm_resume - Execute "resume" callbacks for non-sysdev devices.
  * @state: PM transition of the system being carried out.
@@ -873,19 +840,8 @@ static int async_error;
 static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 {
        int error = 0;
-       struct timer_list timer;
-       struct dpm_drv_wd_data data;
 
        dpm_wait_for_children(dev, async);
-
-       data.dev = dev;
-       data.tsk = get_current();
-       init_timer_on_stack(&timer);
-       timer.expires = jiffies + HZ * 12;
-       timer.function = dpm_drv_timeout;
-       timer.data = (unsigned long)&data;
-       add_timer(&timer);
-
        device_lock(dev);
 
        if (async_error)
@@ -927,10 +883,6 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 
  End:
        device_unlock(dev);
-
-       del_timer_sync(&timer);
-       destroy_timer_on_stack(&timer);
-
        complete_all(&dev->power.completion);
 
        return error;