@@ -36,11 +36,16 @@ static void vexpress_reset_do(struct device *dev, const char *what)
static struct device *vexpress_power_off_device;
-static void vexpress_power_off(void)
+static void vexpress_power_off(struct power_off_handler_block *this)
{
vexpress_reset_do(vexpress_power_off_device, "power off");
}
+static struct power_off_handler_block vexpress_power_off_hb = {
+ .handler = vexpress_power_off,
+ .priority = POWER_OFF_PRIORITY_DEFAULT,
+};
+
static struct device *vexpress_restart_device;
static void vexpress_restart(enum reboot_mode reboot_mode, const char *cmd)
@@ -92,6 +97,7 @@ static int vexpress_reset_probe(struct platform_device *pdev)
const struct of_device_id *match =
of_match_device(vexpress_reset_of_match, &pdev->dev);
struct regmap *regmap;
+ int ret;
if (match)
func = (enum vexpress_reset_func)match->data;
@@ -106,7 +112,12 @@ static int vexpress_reset_probe(struct platform_device *pdev)
switch (func) {
case FUNC_SHUTDOWN:
vexpress_power_off_device = &pdev->dev;
- pm_power_off = vexpress_power_off;
+ ret = register_power_off_handler(&vexpress_power_off_hb);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Failed to register power-off handler\n");
+ return ret;
+ }
break;
case FUNC_RESET:
if (!vexpress_restart_device)