[PATCH] powerpc: iseries: mf related cleanups
Some cleanups in the iSeries code. - Make mf_display_progress() check mf_initialized rather than the caller. - Set mf_initialized in mf_init() rather than in setup.c - Then move mf_initialized into mf.c, the only place it's used. - Move the mf related logic from iSeries_progress() to mf_display_progress() - Use a #define to size the pending_event_prealloc array - Use that define in the initialsation loop rather than sizeof jiggery pokery - Remove stupid comment(s) - Mark stuff static and/or __init Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:

committed by
Paul Mackerras

parent
57cfb814f6
commit
260de22faa
@@ -89,8 +89,6 @@ extern unsigned long embedded_sysmap_end;
|
||||
extern unsigned long iSeries_recal_tb;
|
||||
extern unsigned long iSeries_recal_titan;
|
||||
|
||||
static int mf_initialized;
|
||||
|
||||
static unsigned long cmd_mem_limit;
|
||||
|
||||
struct MemoryBlock {
|
||||
@@ -347,8 +345,6 @@ static void __init iSeries_init_early(void)
|
||||
HvCallEvent_setLpEventQueueInterruptProc(0, 0);
|
||||
|
||||
mf_init();
|
||||
mf_initialized = 1;
|
||||
mb();
|
||||
|
||||
/* If we were passed an initrd, set the ROOT_DEV properly if the values
|
||||
* look sensible. If not, clear initrd reference.
|
||||
@@ -585,12 +581,7 @@ static void iSeries_halt(void)
|
||||
static void __init iSeries_progress(char * st, unsigned short code)
|
||||
{
|
||||
printk("Progress: [%04x] - %s\n", (unsigned)code, st);
|
||||
if (!piranha_simulator && mf_initialized) {
|
||||
if (code != 0xffff)
|
||||
mf_display_progress(code);
|
||||
else
|
||||
mf_clear_src();
|
||||
}
|
||||
mf_display_progress(code);
|
||||
}
|
||||
|
||||
static void __init iSeries_fixup_klimit(void)
|
||||
|
Reference in New Issue
Block a user