Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9ea2101 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[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: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 260de22f

arch/powerpc/platforms/iseries/mf.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ void mf_power_off(void) 
 * Global kernel interface to tell the VSP object in the primary

 * partition to reboot this partition.

 */

void mf_reboot(void)

void mf_reboot(char *cmd)

{

	printk(KERN_INFO "mf.c: Preparing to bounce...\n");

	signal_ce_msg_simple(0x4e, NULL);

arch/powerpc/platforms/iseries/setup.c

+3 −27
Original line number Diff line number Diff line
@@ -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");

}



/*

 * 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)

{

	printk("Progress: [%04x] - %s\n", (unsigned)code, st);
@@ -716,9 +692,9 @@ struct machdep_calls __initdata iseries_md = { 
	.get_irq	= iSeries_get_irq,

	.init_early	= iSeries_init_early,

	.pcibios_fixup	= iSeries_pci_final_fixup,

	.restart	= iSeries_restart,

	.power_off	= iSeries_power_off,

	.halt		= iSeries_halt,

	.restart	= mf_reboot,

	.power_off	= mf_power_off,

	.halt		= mf_power_off,

	.get_boot_time	= iSeries_get_boot_time,

	.set_rtc_time	= iSeries_set_rtc_time,

	.get_rtc_time	= iSeries_get_rtc_time,

include/asm-powerpc/iseries/mf.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern void mf_deallocate_lp_events(HvLpIndex targetLp, HvLpEvent_Type type, 
		unsigned count, MFCompleteHandler hdlr, void *userToken);



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_progress(u16 value);