eeh_reset_device() tests the value of 'bus' more than once but the
only caller, eeh_handle_normal_device() does this test itself and will
never pass NULL.

So, remove the dead tests.

This should not change behaviour.

Signed-off-by: Sam Bobroff <sam.bobr...@au1.ibm.com>
---
 arch/powerpc/kernel/eeh_driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 6c3577133223..1272f2c8cbd2 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -655,7 +655,7 @@ static int eeh_reset_device(bool eeh_aware_driver,
                        pci_hp_remove_devices(bus);
                        pci_unlock_rescan_remove();
                }
-       } else if (bus) {
+       } else {
                eeh_pe_dev_traverse(pe, eeh_rmv_device, rmv_data);
        }
 
@@ -708,7 +708,7 @@ static int eeh_reset_device(bool eeh_aware_driver,
                        eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
                        pci_hp_add_devices(bus);
                }
-       } else if (bus && rmv_data->removed) {
+       } else if (rmv_data->removed) {
                pr_info("EEH: Sleep 5s ahead of partial hotplug\n");
                ssleep(5);
 
-- 
2.16.1.74.g9b0b1f47b

Reply via email to