Commit d3136d77 authored by Sam Bobroff's avatar Sam Bobroff Committed by Michael Ellerman

powerpc/eeh: Remove always-true tests in eeh_reset_device()

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: default avatarSam Bobroff <sam.bobroff@au1.ibm.com>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 5fd13460
...@@ -655,7 +655,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, ...@@ -655,7 +655,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
pci_hp_remove_devices(bus); pci_hp_remove_devices(bus);
pci_unlock_rescan_remove(); pci_unlock_rescan_remove();
} }
} else if (bus) { } else {
eeh_pe_dev_traverse(pe, eeh_rmv_device, rmv_data); eeh_pe_dev_traverse(pe, eeh_rmv_device, rmv_data);
} }
...@@ -708,7 +708,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, ...@@ -708,7 +708,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
eeh_pe_state_clear(pe, EEH_PE_PRI_BUS); eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
pci_hp_add_devices(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"); pr_info("EEH: Sleep 5s ahead of partial hotplug\n");
ssleep(5); ssleep(5);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment