powerpc/eeh: Cleanup logic in eeh_rmv_from_parent_pe()

Move the call to eeh_dev_to_pe() up, so that later it's clear that
"pe" isn't NULL.

Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index 7d6d93cd67e161146878e809d781d88d1e7f02f9..78f125d24bd04145455b319d9fe315e0cc3b3a2c 100644 (file)
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c
@@ -456,7 +456,8 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev)
        int cnt;
        struct pci_dn *pdn = eeh_dev_to_pdn(edev);
 
-       if (!edev->pe) {
+       pe = eeh_dev_to_pe(edev);
+       if (!pe) {
                pr_debug("%s: No PE found for device %04x:%02x:%02x.%01x\n",
                         __func__,  pdn->phb->global_number,
                         pdn->busno,
@@ -466,7 +467,6 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev)
        }
 
        /* Remove the EEH device */
-       pe = eeh_dev_to_pe(edev);
        edev->pe = NULL;
        list_del(&edev->entry);