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>
This commit is contained in:
Родитель
63457b144b
Коммит
5b86ac9e91
|
@ -930,20 +930,18 @@ hard_fail:
|
||||||
* all removed devices correctly to avoid access
|
* all removed devices correctly to avoid access
|
||||||
* the their PCI config any more.
|
* the their PCI config any more.
|
||||||
*/
|
*/
|
||||||
if (frozen_bus) {
|
if (pe->type & EEH_PE_VF) {
|
||||||
if (pe->type & EEH_PE_VF) {
|
eeh_pe_dev_traverse(pe, eeh_rmv_device, NULL);
|
||||||
eeh_pe_dev_traverse(pe, eeh_rmv_device, NULL);
|
eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
|
||||||
eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
|
} else {
|
||||||
} else {
|
eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
|
||||||
eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
|
eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
|
||||||
eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
|
|
||||||
|
|
||||||
pci_lock_rescan_remove();
|
pci_lock_rescan_remove();
|
||||||
pci_hp_remove_devices(frozen_bus);
|
pci_hp_remove_devices(frozen_bus);
|
||||||
pci_unlock_rescan_remove();
|
pci_unlock_rescan_remove();
|
||||||
/* The passed PE should no longer be used */
|
/* The passed PE should no longer be used */
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
final:
|
final:
|
||||||
eeh_pe_state_clear(pe, EEH_PE_RECOVERING);
|
eeh_pe_state_clear(pe, EEH_PE_RECOVERING);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче