diff options
author | Olof Johansson <olof@lixom.net> | 2006-04-18 16:25:53 (GMT) |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-04-22 08:46:11 (GMT) |
commit | 4bd174fe1cca738f53cf8bb9ac3cb327b1f516ed (patch) | |
tree | e4dffbeddbcb7e7f928c5989f0062f8142f83327 /arch/powerpc/platforms/iseries/mf.c | |
parent | 5e1415c3f7d3ad133edb7ce9ca90641cf0f5fe79 (diff) | |
download | linux-fsl-qoriq-4bd174fe1cca738f53cf8bb9ac3cb327b1f516ed.tar.xz |
[PATCH] powerpc: Remove stale iseries global
Not even the iSeries maintainer seems to have access to this legendary
piranha simulator. It adds a bit of ugliness in the common time init
code, and if it's no longer used we might as well be done with it and
remove the bloat.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/iseries/mf.c')
-rw-r--r-- | arch/powerpc/platforms/iseries/mf.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c index d771b8e..1a2c2a5 100644 --- a/arch/powerpc/platforms/iseries/mf.c +++ b/arch/powerpc/platforms/iseries/mf.c @@ -45,7 +45,6 @@ #include "setup.h" -extern int piranha_simulator; static int mf_initialized; /* @@ -658,7 +657,7 @@ static void mf_clear_src(void) void __init mf_display_progress(u16 value) { - if (piranha_simulator || !mf_initialized) + if (!mf_initialized) return; if (0xFFFF == value) @@ -1295,9 +1294,6 @@ __initcall(mf_proc_init); */ void iSeries_get_rtc_time(struct rtc_time *rtc_tm) { - if (piranha_simulator) - return; - mf_get_rtc(rtc_tm); rtc_tm->tm_mon--; } @@ -1316,9 +1312,6 @@ unsigned long iSeries_get_boot_time(void) { struct rtc_time tm; - if (piranha_simulator) - return 0; - mf_get_boot_rtc(&tm); return mktime(tm.tm_year + 1900, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); |