[PATCH 1/3] powerpc/eeh: Slightly simplify eeh_add_to_parent_pe()

[Sam Bobroff]

Simplify some needlessly complicated boolean logic in
eeh_add_to_parent_pe().

Signed-off-by: Sam Bobroff <sbobr...@linux.ibm.com>
---
 arch/powerpc/kernel/eeh_pe.c | 52 +++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index 317a31624526..236e6a667114 100644
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c
@@ -390,32 +390,34 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)
         * components.
         */
        pe = eeh_pe_get(pdn->phb, edev->pe_config_addr, config_addr);
-       if (pe && !(pe->type & EEH_PE_INVALID)) {
-               /* Mark the PE as type of PCI bus */
-               pe->type = EEH_PE_BUS;
-               edev->pe = pe;
-
-               /* Put the edev to PE */
-               list_add_tail(&edev->entry, &pe->edevs);
-               eeh_edev_dbg(edev, "Added to bus PE\n");
-               return 0;
-       } else if (pe && (pe->type & EEH_PE_INVALID)) {
-               list_add_tail(&edev->entry, &pe->edevs);
-               edev->pe = pe;
-               /*
-                * We're running to here because of PCI hotplug caused by
-                * EEH recovery. We need clear EEH_PE_INVALID until the top.
-                */
-               parent = pe;
-               while (parent) {
-                       if (!(parent->type & EEH_PE_INVALID))
-                               break;
-                       parent->type &= ~EEH_PE_INVALID;
-                       parent = parent->parent;
-               }
+       if (pe) {
+               if (pe->type & EEH_PE_INVALID) {
+                       list_add_tail(&edev->entry, &pe->edevs);
+                       edev->pe = pe;
+                       /*
+                        * We're running to here because of PCI hotplug caused 
by
+                        * EEH recovery. We need clear EEH_PE_INVALID until the 
top.
+                        */
+                       parent = pe;
+                       while (parent) {
+                               if (!(parent->type & EEH_PE_INVALID))
+                                       break;
+                               parent->type &= ~EEH_PE_INVALID;
+                               parent = parent->parent;
+                       }
 
-               eeh_edev_dbg(edev, "Added to device PE (parent: PE#%x)\n",
-                            pe->parent->addr);
+                       eeh_edev_dbg(edev,
+                                    "Added to device PE (parent: PE#%x)\n",
+                                    pe->parent->addr);
+               } else {
+                       /* Mark the PE as type of PCI bus */
+                       pe->type = EEH_PE_BUS;
+                       edev->pe = pe;
+
+                       /* Put the edev to PE */
+                       list_add_tail(&edev->entry, &pe->edevs);
+                       eeh_edev_dbg(edev, "Added to bus PE\n");
+               }
                return 0;
        }
 
-- 
2.22.0.216.g00a2a96fc9