[POWERPC] Fix future firmware feature fixups function failure

Move firmware feature initialisation from pSeries_init_early to the
earlier pSeries_probe_hypertas so they are initialised before firmware
feature fixups are applied.

Currently firmware feature sections are only used for iSeries which
initialises the these features much earlier.  This is a bug in waiting
on pSeries.

Also adds some whitespace fixups.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 3 insertions, 16 deletions

diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index 29bf83bfb1f0..8b18a1c40092 100644
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
@@ -66,24 +66,13 @@ firmware_features_table[FIRMWARE_MAX_FEATURES] = {
  * device-tree/ibm,hypertas-functions.  Ultimately this functionality may
  * be moved into prom.c prom_init().
  */
-void __init fw_feature_init(void)
+void __init fw_feature_init(const char *hypertas, unsigned long len)
 {
-        struct device_node *dn;
-        const char *hypertas, *s;
-        int len, i;
+        const char *s;
+        int i;
 
         DBG(" -> fw_feature_init()\n");
 
-        dn = of_find_node_by_path("/rtas");
-        if (dn == NULL) {
-                printk(KERN_ERR "WARNING! Cannot find RTAS in device-tree!\n");
-                goto out;
-        }
-
-        hypertas = of_get_property(dn, "ibm,hypertas-functions", &len);
-        if (hypertas == NULL)
-                goto out;
-
         for (s = hypertas; s < hypertas + len; s += strlen(s) + 1) {
                 for (i = 0; i < FIRMWARE_MAX_FEATURES; i++) {
                         /* check value against table of strings */
@@ -98,7 +87,5 @@ void __init fw_feature_init(void)
                 }
         }
 
-out:
-        of_node_put(dn);
         DBG(" <- fw_feature_init()\n");
 }