commit 9ddc622e3ad7c9355042275de89ee4422b790186
author Brandon Wyman <bjwyman@gmail.com> Thu Oct 28 17:28:01 2021 +0000
committer Brandon Wyman <bjwyman@gmail.com> Tue Nov 02 19:53:41 2021 +0000
tree 2183beb8c87ab60a7cae511b1641288d5f9e303c
parent a2a830b1ffa327bd36dcca5c1cac462ae7737a25

psu-ng: Refactor PowerSupply::isFaulted

Refactor the isFaulted() function to check the various possible faults,
return true if any of the faults are detected. This should avoid needing
an extra flag to set/clear in addition to the one for the specific
fault.

Tested:
    Verified input fault command logs error.
    Verified OV/OC fault logs error.

Change-Id: I111705a175a49b01352ac86178620d6f2cb1231f
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>

phosphor-power-supply/power_supply.cpp

diff --git a/phosphor-power-supply/power_supply.cpp b/phosphor-power-supply/power_supply.cpp
index 3f3a595..73998f3 100644
--- a/phosphor-power-supply/power_supply.cpp
+++ b/phosphor-power-supply/power_supply.cpp
@@ -223,7 +223,7 @@
                                         statusWord, statusCML)
                                 .c_str());
                     }
-                    faultFound = true;
+
                     cmlFault = true;
                 }
 
@@ -239,7 +239,6 @@
                                 .c_str());
                     }
 
-                    faultFound = true;
                     inputFault = true;
                 }
 
@@ -254,7 +253,7 @@
                                         statusWord, statusMFR, statusVout)
                                 .c_str());
                     }
-                    faultFound = true;
+
                     voutOVFault = true;
                 }
 
@@ -269,7 +268,7 @@
                                         statusWord, statusMFR)
                                 .c_str());
                     }
-                    faultFound = true;
+
                     mfrFault = true;
                 }
 
@@ -285,13 +284,11 @@
                                 .c_str());
                     }
 
-                    faultFound = true;
                     vinUVFault = true;
                 }
             }
             else
             {
-                faultFound = false;
                 cmlFault = false;
                 inputFault = false;
                 mfrFault = false;
@@ -342,7 +339,6 @@
     // I do not care what the return value is.
     if (present)
     {
-        faultFound = false;
         inputFault = false;
         mfrFault = false;
         statusMFR = 0;