@@ -332,7 +332,8 @@ static void __init sh7785lcr_setup(char **cmdline_p)
printk(KERN_INFO "Renesas Technology Corp. R0P7785LC0011RL support.\n");
- pm_power_off = sh7785lcr_power_off;
+ register_power_off_handler_simple(sh7785lcr_power_off,
+ POWER_OFF_PRIORITY_DEFAULT);
/* sm501 DRAM configuration */
sm501_reg = ioremap_nocache(SM107_REG_ADDR, SM501_DRAM_CONTROL);
@@ -204,7 +204,8 @@ static void __init urquell_setup(char **cmdline_p)
{
printk(KERN_INFO "Renesas Technology Corp. Urquell support.\n");
- pm_power_off = urquell_power_off;
+ register_power_off_handler_simple(urquell_power_off,
+ POWER_OFF_PRIORITY_DEFAULT);
register_smp_ops(&shx3_smp_ops);
}
@@ -385,7 +385,8 @@ static void __init highlander_setup(char **cmdline_p)
__raw_writew(__raw_readw(PA_IVDRCTL) | 0x01, PA_IVDRCTL); /* Si13112 */
- pm_power_off = r7780rp_power_off;
+ register_power_off_handler_simple(r7780rp_power_off,
+ POWER_OFF_PRIORITY_DEFAULT);
}
static unsigned char irl2irq[HL_NR_IRL];
@@ -89,7 +89,8 @@ static void __init landisk_setup(char **cmdline_p)
__raw_writeb(__raw_readb(PA_LED) | 0x03, PA_LED);
printk(KERN_INFO "I-O DATA DEVICE, INC. \"LANDISK Series\" support.\n");
- pm_power_off = landisk_power_off;
+ register_power_off_handler_simple(landisk_power_off,
+ POWER_OFF_PRIORITY_DEFAULT);
}
/*
@@ -279,7 +279,8 @@ static void __init rts7751r2d_setup(char **cmdline_p)
(ver >> 4) & 0xf, ver & 0xf);
__raw_writew(0x0000, PA_OUTPORT);
- pm_power_off = rts7751r2d_power_off;
+ register_power_off_handler_simple(rts7751r2d_power_off,
+ POWER_OFF_PRIORITY_DEFAULT);
/* sm501 dram configuration:
* ColSizeX = 11 - External Memory Column Size: 256 words.
@@ -252,7 +252,8 @@ static void __init sdk7786_setup(char **cmdline_p)
pr_info("\tPCB revision:\t%d\n", fpga_read_reg(PCBRR) & 0xf);
machine_ops.restart = sdk7786_restart;
- pm_power_off = sdk7786_power_off;
+ register_power_off_handler_simple(sdk7786_power_off,
+ POWER_OFF_PRIORITY_DEFAULT);
register_smp_ops(&shx3_smp_ops);
}
Register with kernel power-off handler instead of setting pm_power_off directly. Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- v3: - Replace poweroff in all newly introduced variables and in text with power_off or power-off as appropriate - Replace POWEROFF_PRIORITY_xxx with POWER_OFF_PRIORITY_xxx v2: - Use defines to specify poweroff handler priorities arch/sh/boards/board-sh7785lcr.c | 3 ++- arch/sh/boards/board-urquell.c | 3 ++- arch/sh/boards/mach-highlander/setup.c | 3 ++- arch/sh/boards/mach-landisk/setup.c | 3 ++- arch/sh/boards/mach-r2d/setup.c | 3 ++- arch/sh/boards/mach-sdk7786/setup.c | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-)