Michal Suchanek 169b1f
From 2d5be6f16c4ba5c27d06704976daf55f3236a236 Mon Sep 17 00:00:00 2001
Michal Suchanek 169b1f
From: Nathan Lynch <nathanl@linux.ibm.com>
Michal Suchanek 169b1f
Date: Mon, 7 Dec 2020 15:51:41 -0600
Michal Suchanek 169b1f
Subject: [PATCH] powerpc/pseries/mobility: error message improvements
Michal Suchanek 169b1f
Michal Suchanek 169b1f
References: bsc#1181674 ltc#189159
Michal Suchanek 169b1f
Patch-mainline: v5.11-rc1
Michal Suchanek 169b1f
Git-commit: 2d5be6f16c4ba5c27d06704976daf55f3236a236
Michal Suchanek 169b1f
Michal Suchanek 169b1f
- Convert printk(KERN_ERR) to pr_err().
Michal Suchanek 169b1f
- Include errno in property update failure message.
Michal Suchanek 169b1f
- Remove reference to "Post-mobility" from device tree update message:
Michal Suchanek 169b1f
  with pr_err() it will have a "mobility:" prefix.
Michal Suchanek 169b1f
Michal Suchanek 169b1f
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Michal Suchanek 169b1f
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Michal Suchanek 169b1f
Link: https://lore.kernel.org/r/20201207215200.1785968-10-nathanl@linux.ibm.com
Michal Suchanek 169b1f
Acked-by: Michal Suchanek <msuchanek@suse.de>
Michal Suchanek 169b1f
---
Michal Suchanek 169b1f
 arch/powerpc/platforms/pseries/mobility.c | 7 +++----
Michal Suchanek 169b1f
 1 file changed, 3 insertions(+), 4 deletions(-)
Michal Suchanek 169b1f
Michal Suchanek 169b1f
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
Michal Suchanek 169b1f
index 527a64e2d89f..31d81b7da961 100644
Michal Suchanek 169b1f
--- a/arch/powerpc/platforms/pseries/mobility.c
Michal Suchanek 169b1f
+++ b/arch/powerpc/platforms/pseries/mobility.c
Michal Suchanek 169b1f
@@ -208,8 +208,8 @@ static int update_dt_node(__be32 phandle, s32 scope)
Michal Suchanek 169b1f
 				rc = update_dt_property(dn, &prop, prop_name,
Michal Suchanek 169b1f
 							vd, prop_data);
Michal Suchanek 169b1f
 				if (rc) {
Michal Suchanek 169b1f
-					printk(KERN_ERR "Could not update %s"
Michal Suchanek 169b1f
-					       " property\n", prop_name);
Michal Suchanek 169b1f
+					pr_err("updating %s property failed: %d\n",
Michal Suchanek 169b1f
+					       prop_name, rc);
Michal Suchanek 169b1f
 				}
Michal Suchanek 169b1f
 
Michal Suchanek 169b1f
 				prop_data += vd;
Michal Suchanek 169b1f
@@ -343,8 +343,7 @@ void post_mobility_fixup(void)
Michal Suchanek 169b1f
 
Michal Suchanek 169b1f
 	rc = pseries_devicetree_update(MIGRATION_SCOPE);
Michal Suchanek 169b1f
 	if (rc)
Michal Suchanek 169b1f
-		printk(KERN_ERR "Post-mobility device tree update "
Michal Suchanek 169b1f
-			"failed: %d\n", rc);
Michal Suchanek 169b1f
+		pr_err("device tree update failed: %d\n", rc);
Michal Suchanek 169b1f
 
Michal Suchanek 169b1f
 	cacheinfo_rebuild();
Michal Suchanek 169b1f
 
Michal Suchanek 169b1f
-- 
Michal Suchanek 169b1f
2.26.2
Michal Suchanek 169b1f