Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: Make hs7751rvoip/rts7751r2d use pm_power_off.

These were previously sprinkled in machine_power_off(),
though missed being updated when the rest of the boards
switched over.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+18 -6
+11 -6
arch/sh/boards/renesas/hs7751rvoip/setup.c
··· 12 12 13 13 #include <linux/init.h> 14 14 #include <linux/irq.h> 15 - 16 - #include <linux/hdreg.h> 17 - #include <linux/ide.h> 18 - #include <asm/io.h> 19 - #include <asm/hs7751rvoip/hs7751rvoip.h> 20 - 21 15 #include <linux/mm.h> 22 16 #include <linux/vmalloc.h> 17 + #include <linux/hdreg.h> 18 + #include <linux/ide.h> 19 + #include <linux/pm.h> 20 + #include <asm/io.h> 21 + #include <asm/hs7751rvoip/hs7751rvoip.h> 23 22 24 23 /* defined in mm/ioremap.c */ 25 24 extern void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags); ··· 30 31 return "HS7751RVoIP"; 31 32 } 32 33 34 + static void hs7751rvoip_power_off(void) 35 + { 36 + ctrl_outw(ctrl_inw(PA_OUTPORTR) & 0xffdf, PA_OUTPORTR); 37 + } 38 + 33 39 /* 34 40 * Initialize the board 35 41 */ ··· 42 38 { 43 39 printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n"); 44 40 ctrl_outb(0xf0, PA_OUTPORTR); 41 + pm_power_off = hs7751rvoip_power_off; 45 42 debug_counter = 0; 46 43 } 47 44
+7
arch/sh/boards/renesas/rts7751r2d/setup.c
··· 10 10 */ 11 11 12 12 #include <linux/init.h> 13 + #include <linux/pm.h> 13 14 #include <asm/io.h> 14 15 #include <asm/rts7751r2d/rts7751r2d.h> 15 16 ··· 21 20 return "RTS7751R2D"; 22 21 } 23 22 23 + static void rts7751r2d_power_off(void) 24 + { 25 + ctrl_outw(0x0001, PA_POWOFF); 26 + } 27 + 24 28 /* 25 29 * Initialize the board 26 30 */ ··· 33 27 { 34 28 printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n"); 35 29 ctrl_outw(0x0000, PA_OUTPORT); 30 + pm_power_off = rts7751r2d_power_off; 36 31 debug_counter = 0; 37 32 }