Solve compilation issues when FAPI_INF is disabled

Change-Id: I08e54bf351f2f732d03c81e0e9a80506c4b7ff40
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33166
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33183
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

2 files changed, 14 insertions, 24 deletions

diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pfet_control.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pfet_control.C
index bccad9ff..90992d2a 100755
--- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pfet_control.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pfet_control.C
@@ -139,14 +139,12 @@ fapi2::ReturnCode p9_pm_pfet_control_eq(
     const PM_PFET_TYPE_C::pfet_force_t i_op)
 {
     fapi2::current_err     = fapi2::FAPI2_RC_SUCCESS;
-    uint32_t l_unit_pos     = 0;
     bool core_target_found = false;
 
     FAPI_INF("p9_pm_pfet_control_eq: Entering...");
 
-    // Get chiplet position
-    l_unit_pos = i_target.getChipletNumber();
-    FAPI_INF("pfet control for EQ chiplet %d", l_unit_pos);
+    // Print chiplet position
+    FAPI_INF("pfet control for EQ chiplet %d", i_target.getChipletNumber());
 
     // When i_op == OFF all functional cores first followed by EQ
     // When i_op == ON EQ first followed by all functional cores
@@ -160,8 +158,7 @@ fapi2::ReturnCode p9_pm_pfet_control_eq(
     for (auto& l_core_target : i_target.getChildren<fapi2::TARGET_TYPE_CORE>
          (fapi2::TARGET_STATE_FUNCTIONAL))
     {
-        l_unit_pos = l_core_target.getChipletNumber();
-        FAPI_INF("Core chiplet %d in EQ", l_unit_pos);
+        FAPI_INF("Core chiplet %d in EQ", l_core_target.getChipletNumber());
         FAPI_TRY(pfet_ctrl<fapi2::TargetType::TARGET_TYPE_CORE>(l_core_target,
                  i_rail, i_op), "Error: pfet_ctrl for core!!");
         core_target_found = true;
@@ -176,7 +173,7 @@ fapi2::ReturnCode p9_pm_pfet_control_eq(
     else if( ((i_op == PM_PFET_TYPE_C::ON) && !(core_target_found)) ||
              ((i_op == PM_PFET_TYPE_C::OFF) && !(core_target_found)) )
     {
-        FAPI_INF("EQ chiplet no. %d; No core target found in functional state in this EQ\n", l_unit_pos);
+        FAPI_INF("EQ chiplet no. %d; No core target found in functional state in this EQ\n", i_target.getChipletNumber());
     }
 
     FAPI_INF("p9_pm_pfet_control_eq: ...Exiting");
@@ -193,21 +190,18 @@ fapi2::ReturnCode p9_pm_pfet_control_ex(
     const PM_PFET_TYPE_C::pfet_force_t i_op)
 {
     fapi2::current_err     = fapi2::FAPI2_RC_SUCCESS;
-    uint32_t l_unit_pos     = 0;
     bool core_target_found = false;
 
     FAPI_INF("p9_pm_pfet_control_ex: Entering...");
 
     // Get chiplet position
-    l_unit_pos = i_target.getChipletNumber();
-    FAPI_INF("pfet control for EX chiplet %d", l_unit_pos);
+    FAPI_INF("pfet control for EX chiplet %d", i_target.getChipletNumber());
 
     // Check for all core chiplets in EX and power on/off targets accordingly
     for (auto& l_core_target : i_target.getChildren<fapi2::TARGET_TYPE_CORE>
          (fapi2::TARGET_STATE_FUNCTIONAL))
     {
-        l_unit_pos = l_core_target.getChipletNumber();
-        FAPI_INF("Core chiplet %d in EX", l_unit_pos);
+        FAPI_INF("Core chiplet %d in EX", l_core_target.getChipletNumber());
         FAPI_TRY(pfet_ctrl<fapi2::TargetType::TARGET_TYPE_CORE>(l_core_target,
                  i_rail, i_op), "Error: pfet_ctrl for core!!");
         core_target_found = true;
@@ -216,7 +210,8 @@ fapi2::ReturnCode p9_pm_pfet_control_ex(
     // When no functional chiplet target found
     if(!core_target_found)
     {
-        FAPI_INF("EX chiplet no. %d; No core target found in functional state in this EX\n", l_unit_pos);
+        FAPI_INF("EX chiplet no. %d; No core target found in functional state"
+                 " in this EX", i_target.getChipletNumber());
     }
 
     FAPI_INF("p9_pm_pfet_control_ex: ...Exiting");
@@ -257,21 +252,18 @@ fapi2::ReturnCode pfet_ctrl(
     const PM_PFET_TYPE_C::pfet_force_t i_op)
 {
     fapi2::current_err = fapi2::FAPI2_RC_SUCCESS;
-    uint32_t l_unit_pos     = 0;
 
     FAPI_INF("pfet_ctrl: Entering...");
 
-    // Get chiplet position
-    l_unit_pos = i_target.getChipletNumber();
-
     // Check for target passed
     if(i_target.getType() & fapi2::TARGET_TYPE_CORE)
     {
-        FAPI_INF("pfet control for Core chiplet %d", l_unit_pos);
+        FAPI_INF("pfet control for Core chiplet %d",
+                 i_target.getChipletNumber());
     }
     else if(i_target.getType() & fapi2::TARGET_TYPE_EQ)
     {
-        FAPI_INF("pfet control for EQ chiplet %d", l_unit_pos);
+        FAPI_INF("pfet control for EQ chiplet %d", i_target.getChipletNumber());
     }
     else
     {
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.C b/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.C
index e93dd70a..e9c3a8b0 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.C
@@ -57,17 +57,15 @@ fapi2::ReturnCode p9_quad_power_off(
     const fapi2::Target<fapi2::TARGET_TYPE_EQ>& i_target)
 {
     fapi2::ReturnCode rc = fapi2::FAPI2_RC_SUCCESS;
-    uint32_t l_unit_pos = 0;
 
     FAPI_INF("p9_quad_power_off: Entering...");
 
-    // Get chiplet position
-    l_unit_pos = i_target.getChipletNumber();
-    FAPI_INF("Quad power off chiplet no.%d", l_unit_pos);
+    // Print chiplet position
+    FAPI_INF("Quad power off chiplet no.%d", i_target.getChipletNumber());
 
     // Call the procedure
     FAPI_EXEC_HWP(rc, p9_pm_pfet_control_eq, i_target,
-                  PM_PFET_TYPE_C::BOTH,PM_PFET_TYPE_C::OFF);
+                  PM_PFET_TYPE_C::BOTH, PM_PFET_TYPE_C::OFF);
     FAPI_TRY(rc);
 
 fapi_try_exit: