powerpc/eeh: Remove misleading test in eeh_handle_normal_event()

Remove a test that checks if "frozen_bus" is NULL, because it cannot
have changed since it was tested at the start of the function and so
must be true here.

Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 5b7a5ed4db4d50cca60bd59ccd57ec1a1ee2f11b..04a5d9db5499d7b8d5434e5aa709125bbe5a441e 100644 (file)
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -930,20 +930,18 @@ hard_fail:
         * all removed devices correctly to avoid access
         * the their PCI config any more.
         */
-       if (frozen_bus) {
-               if (pe->type & EEH_PE_VF) {
-                       eeh_pe_dev_traverse(pe, eeh_rmv_device, NULL);
-                       eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
-               } else {
-                       eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
-                       eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
+       if (pe->type & EEH_PE_VF) {
+               eeh_pe_dev_traverse(pe, eeh_rmv_device, NULL);
+               eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
+       } else {
+               eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
+               eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
 
-                       pci_lock_rescan_remove();
-                       pci_hp_remove_devices(frozen_bus);
-                       pci_unlock_rescan_remove();
-                       /* The passed PE should no longer be used */
-                       return;
-               }
+               pci_lock_rescan_remove();
+               pci_hp_remove_devices(frozen_bus);
+               pci_unlock_rescan_remove();
+               /* The passed PE should no longer be used */
+               return;
        }
 final:
        eeh_pe_state_clear(pe, EEH_PE_RECOVERING);