[PATCH 43/44] hwmon: (ab8500) Call kernel_power_off instead of pm_power_off
From: Guenter Roeck <linux@roeck-us.net>
Date: 2014-10-07 05:35:44
Also in:
linux-acpi, linux-alpha, linux-arm-kernel, linux-devicetree, linux-efi, linux-mips, linux-pm, linux-s390, linux-sh, linux-tegra, linux-um, lkml
Subsystem:
hardware monitoring, the rest · Maintainers:
Guenter Roeck, Linus Torvalds
Drivers should not call pm_power_off directly; it is not guaranteed to be non-NULL. Call kernel_power_off instead. Cc: Jean Delvare <redacted> Reviewed-by: Jean Delvare <redacted> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/hwmon/ab8500.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/ab8500.c b/drivers/hwmon/ab8500.c
index d844dc8..8b6a4f4 100644
--- a/drivers/hwmon/ab8500.c
+++ b/drivers/hwmon/ab8500.c@@ -6,7 +6,7 @@ * * When the AB8500 thermal warning temperature is reached (threshold cannot * be changed by SW), an interrupt is set, and if no further action is taken - * within a certain time frame, pm_power off will be called. + * within a certain time frame, kernel_power_off will be called. * * When AB8500 thermal shutdown temperature is reached a hardware shutdown of * the AB8500 will occur.
@@ -21,6 +21,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/power/ab8500.h> +#include <linux/reboot.h> #include <linux/slab.h> #include <linux/sysfs.h> #include "abx500.h"
@@ -106,7 +107,7 @@ static void ab8500_thermal_power_off(struct work_struct *work) dev_warn(&abx500_data->pdev->dev, "Power off due to critical temp\n"); - pm_power_off(); + kernel_power_off(); } static ssize_t ab8500_show_name(struct device *dev,
--
1.9.1