[PATCH] rename fw_feature_init()

[Olof Johansson]

Hi,

fw_feature_init() on pSeries is really just a setup of hypervisor
features. Rename the function accordingly.

Signed-off-by: Olof Johansson <olof at lixom.net>
---

 firmware.c |   18 +++++++++---------
 firmware.h |    2 +-
 setup.c    |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: powerpc-git/arch/powerpc/platforms/pseries/firmware.c
===================================================================
--- powerpc-git.orig/arch/powerpc/platforms/pseries/firmware.c
+++ powerpc-git/arch/powerpc/platforms/pseries/firmware.c
@@ -35,10 +35,10 @@
 typedef struct {
     unsigned long val;
     char * name;
-} firmware_feature_t;
+} hypervisor_feature_t;
 
-static __initdata firmware_feature_t
-firmware_features_table[FIRMWARE_MAX_FEATURES] = {
+static __initdata hypervisor_feature_t
+hypervisor_features_table[FIRMWARE_MAX_FEATURES] = {
 	{FW_FEATURE_PFT,		"hcall-pft"},
 	{FW_FEATURE_TCE,		"hcall-tce"},
 	{FW_FEATURE_SPRG0,		"hcall-sprg0"},
@@ -65,13 +65,13 @@ firmware_features_table[FIRMWARE_MAX_FEA
  * device-tree/ibm,hypertas-functions.  Ultimately this functionality may
  * be moved into prom.c prom_init().
  */
-void __init fw_feature_init(void)
+void __init hypervisor_feature_init(void)
 {
 	struct device_node *dn;
 	char *hypertas, *s;
 	int len, i;
 
-	DBG(" -> fw_feature_init()\n");
+	DBG(" -> hypervisor_feature_init()\n");
 
 	dn = of_find_node_by_path("/rtas");
 	if (dn == NULL) {
@@ -86,18 +86,18 @@ void __init fw_feature_init(void)
 	for (s = hypertas; s < hypertas + len; s += strlen(s) + 1) {
 		for (i = 0; i < FIRMWARE_MAX_FEATURES; i++) {
 			/* check value against table of strings */
-			if (!firmware_features_table[i].name ||
-			    strcmp(firmware_features_table[i].name, s))
+			if (!hypervisor_features_table[i].name ||
+			    strcmp(hypervisor_features_table[i].name, s))
 				continue;
 
 			/* we have a match */
 			ppc64_firmware_features |=
-				firmware_features_table[i].val;
+				hypervisor_features_table[i].val;
 			break;
 		}
 	}
 
 out:
 	of_node_put(dn);
-	DBG(" <- fw_feature_init()\n");
+	DBG(" <- hypervisor_feature_init()\n");
 }
Index: powerpc-git/arch/powerpc/platforms/pseries/firmware.h
===================================================================
--- powerpc-git.orig/arch/powerpc/platforms/pseries/firmware.h
+++ powerpc-git/arch/powerpc/platforms/pseries/firmware.h
@@ -12,6 +12,6 @@
 
 #include <asm/firmware.h>
 
-extern void __init fw_feature_init(void);
+extern void __init hypervisor_feature_init(void);
 
 #endif /* _PSERIES_FIRMWARE_H */
Index: powerpc-git/arch/powerpc/platforms/pseries/setup.c
===================================================================
--- powerpc-git.orig/arch/powerpc/platforms/pseries/setup.c
+++ powerpc-git/arch/powerpc/platforms/pseries/setup.c
@@ -324,7 +324,7 @@ static void __init pSeries_init_early(vo
 
 	DBG(" -> pSeries_init_early()\n");
 
-	fw_feature_init();
+	hypervisor_feature_init();
 	
 	if (platform_is_lpar())
 		hpte_init_lpar();