| Message ID | 52c15c0414d248981e251386384ed2a716315003.1521427331.git.sam.bobroff@au1.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5b86ac9e91715224ae9e8ee2b544f7392b7fc8b2 |
| Headers | show |
| Series | EEH refactoring 1 | expand |
On 19/3/18 1:46 pm, Sam Bobroff wrote: > 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> > --- > arch/powerpc/kernel/eeh_driver.c | 24 +++++++++++------------- > 1 file changed, 11 insertions(+), 13 deletions(-) > > diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c > index 5b7a5ed4db4d..04a5d9db5499 100644 > --- a/arch/powerpc/kernel/eeh_driver.c > +++ b/arch/powerpc/kernel/eeh_driver.c > @@ -930,20 +930,18 @@ void eeh_handle_normal_event(struct eeh_pe *pe) > * 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); >
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index 5b7a5ed4db4d..04a5d9db5499 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -930,20 +930,18 @@ void eeh_handle_normal_event(struct eeh_pe *pe) * 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);
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> --- arch/powerpc/kernel/eeh_driver.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)