drivers: power: use 'current' instead of 'get_current()'
authorGuenter Roeck <groeck@chromium.org>
Thu, 3 Mar 2016 17:44:44 +0000 (09:44 -0800)
committerGuenter Roeck <groeck@chromium.org>
Thu, 3 Mar 2016 17:44:44 +0000 (09:44 -0800)
get_current() to get the current thread pointer is not defined for all
architectures. This results in the following build error for several
architectures (s390, powerpc, and possibly others).

drivers/base/power/main.c: In function '__device_suspend':
drivers/base/power/main.c:1415:2: error:
implicit declaration of function 'get_current'

Use 'current' instead. Also include asm/current.h instead of depending on
an implicit include.

Fixes: ad86cc8ad632 ("drivers: power: Add watchdog timer to catch drivers which lockup during suspend."
Signed-off-by: Guenter Roeck <groeck@chromium.org>
drivers/base/power/main.c

index a54d810f29666292845380961eed247d068d4f15..6ed8b932662967f37f3826a1da56cf621c6eddbb 100644 (file)
@@ -35,6 +35,8 @@
 #include <linux/timer.h>
 #include <linux/wakeup_reason.h>
 
+#include <asm/current.h>
+
 #include "../base.h"
 #include "power.h"
 
@@ -1412,7 +1414,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
                goto Complete;
        
        data.dev = dev;
-       data.tsk = get_current();
+       data.tsk = current;
        init_timer_on_stack(&timer);
        timer.expires = jiffies + HZ * 12;
        timer.function = dpm_drv_timeout;