提交 a9ea2101 编写于 作者: M Michael Ellerman 提交者: Paul Mackerras

[PATCH] powerpc: iseries: Remove pointless iSeries_(restart|power_off|halt)

These routines just call through to the mf routines, so point ppc_md straight
at the mf routines. We need to pass the cmd through to mf_reboot to make it
work, but that seems reasonable.
Signed-off-by: NMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
上级 260de22f
...@@ -599,7 +599,7 @@ void mf_power_off(void) ...@@ -599,7 +599,7 @@ void mf_power_off(void)
* Global kernel interface to tell the VSP object in the primary * Global kernel interface to tell the VSP object in the primary
* partition to reboot this partition. * partition to reboot this partition.
*/ */
void mf_reboot(void) void mf_reboot(char *cmd)
{ {
printk(KERN_INFO "mf.c: Preparing to bounce...\n"); printk(KERN_INFO "mf.c: Preparing to bounce...\n");
signal_ce_msg_simple(0x4e, NULL); signal_ce_msg_simple(0x4e, NULL);
......
...@@ -554,30 +554,6 @@ static void iSeries_show_cpuinfo(struct seq_file *m) ...@@ -554,30 +554,6 @@ static void iSeries_show_cpuinfo(struct seq_file *m)
seq_printf(m, "machine\t\t: 64-bit iSeries Logical Partition\n"); seq_printf(m, "machine\t\t: 64-bit iSeries Logical Partition\n");
} }
/*
* Document me.
*/
static void iSeries_restart(char *cmd)
{
mf_reboot();
}
/*
* Document me.
*/
static void iSeries_power_off(void)
{
mf_power_off();
}
/*
* Document me.
*/
static void iSeries_halt(void)
{
mf_power_off();
}
static void __init iSeries_progress(char * st, unsigned short code) static void __init iSeries_progress(char * st, unsigned short code)
{ {
printk("Progress: [%04x] - %s\n", (unsigned)code, st); printk("Progress: [%04x] - %s\n", (unsigned)code, st);
...@@ -716,9 +692,9 @@ struct machdep_calls __initdata iseries_md = { ...@@ -716,9 +692,9 @@ struct machdep_calls __initdata iseries_md = {
.get_irq = iSeries_get_irq, .get_irq = iSeries_get_irq,
.init_early = iSeries_init_early, .init_early = iSeries_init_early,
.pcibios_fixup = iSeries_pci_final_fixup, .pcibios_fixup = iSeries_pci_final_fixup,
.restart = iSeries_restart, .restart = mf_reboot,
.power_off = iSeries_power_off, .power_off = mf_power_off,
.halt = iSeries_halt, .halt = mf_power_off,
.get_boot_time = iSeries_get_boot_time, .get_boot_time = iSeries_get_boot_time,
.set_rtc_time = iSeries_set_rtc_time, .set_rtc_time = iSeries_set_rtc_time,
.get_rtc_time = iSeries_get_rtc_time, .get_rtc_time = iSeries_get_rtc_time,
......
...@@ -41,7 +41,7 @@ extern void mf_deallocate_lp_events(HvLpIndex targetLp, HvLpEvent_Type type, ...@@ -41,7 +41,7 @@ extern void mf_deallocate_lp_events(HvLpIndex targetLp, HvLpEvent_Type type,
unsigned count, MFCompleteHandler hdlr, void *userToken); unsigned count, MFCompleteHandler hdlr, void *userToken);
extern void mf_power_off(void); extern void mf_power_off(void);
extern void mf_reboot(void); extern void mf_reboot(char *cmd);
extern void mf_display_src(u32 word); extern void mf_display_src(u32 word);
extern void mf_display_progress(u16 value); extern void mf_display_progress(u16 value);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册