diff options
author | Guenter Roeck <linux@roeck-us.net> | 2014-09-29 22:45:02 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2014-10-03 11:19:02 -0400 |
commit | 3afb57fa721f94206e642f8fda51f5a89dda3dfb (patch) | |
tree | c19dace0b3f1f63616a2e24da594a8fd96f5d661 | |
parent | 7ad8966f4f0a4606dfaba119ea4e2b3ac4c548ee (diff) |
hwmon: (ab8500) Call kernel_power_off instead of pm_power_off
Drivers should not call pm_power_off directly; it is not guaranteed
to be non-NULL. Call kernel_power_off instead.
Cc: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r-- | drivers/hwmon/ab8500.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/ab8500.c b/drivers/hwmon/ab8500.c index d844dc806853..8b6a4f4c8774 100644 --- a/drivers/hwmon/ab8500.c +++ b/drivers/hwmon/ab8500.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | * When the AB8500 thermal warning temperature is reached (threshold cannot | 7 | * When the AB8500 thermal warning temperature is reached (threshold cannot |
8 | * be changed by SW), an interrupt is set, and if no further action is taken | 8 | * be changed by SW), an interrupt is set, and if no further action is taken |
9 | * within a certain time frame, pm_power off will be called. | 9 | * within a certain time frame, kernel_power_off will be called. |
10 | * | 10 | * |
11 | * When AB8500 thermal shutdown temperature is reached a hardware shutdown of | 11 | * When AB8500 thermal shutdown temperature is reached a hardware shutdown of |
12 | * the AB8500 will occur. | 12 | * the AB8500 will occur. |
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
23 | #include <linux/power/ab8500.h> | 23 | #include <linux/power/ab8500.h> |
24 | #include <linux/reboot.h> | ||
24 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
25 | #include <linux/sysfs.h> | 26 | #include <linux/sysfs.h> |
26 | #include "abx500.h" | 27 | #include "abx500.h" |
@@ -106,7 +107,7 @@ static void ab8500_thermal_power_off(struct work_struct *work) | |||
106 | 107 | ||
107 | dev_warn(&abx500_data->pdev->dev, "Power off due to critical temp\n"); | 108 | dev_warn(&abx500_data->pdev->dev, "Power off due to critical temp\n"); |
108 | 109 | ||
109 | pm_power_off(); | 110 | kernel_power_off(); |
110 | } | 111 | } |
111 | 112 | ||
112 | static ssize_t ab8500_show_name(struct device *dev, | 113 | static ssize_t ab8500_show_name(struct device *dev, |