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

powerpc/eeh: Rename frozen_bus to bus in eeh_handle_normal_event()

The name "frozen_bus" is misleading: it's not necessarily frozen, it's
just the PE's PCI bus.
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 5b86ac9e
...@@ -754,14 +754,14 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, ...@@ -754,14 +754,14 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
*/ */
void eeh_handle_normal_event(struct eeh_pe *pe) void eeh_handle_normal_event(struct eeh_pe *pe)
{ {
struct pci_bus *frozen_bus; struct pci_bus *bus;
struct eeh_dev *edev, *tmp; struct eeh_dev *edev, *tmp;
int rc = 0; int rc = 0;
enum pci_ers_result result = PCI_ERS_RESULT_NONE; enum pci_ers_result result = PCI_ERS_RESULT_NONE;
struct eeh_rmv_data rmv_data = {LIST_HEAD_INIT(rmv_data.edev_list), 0}; struct eeh_rmv_data rmv_data = {LIST_HEAD_INIT(rmv_data.edev_list), 0};
frozen_bus = eeh_pe_bus_get(pe); bus = eeh_pe_bus_get(pe);
if (!frozen_bus) { if (!bus) {
pr_err("%s: Cannot find PCI bus for PHB#%x-PE#%x\n", pr_err("%s: Cannot find PCI bus for PHB#%x-PE#%x\n",
__func__, pe->phb->global_number, pe->addr); __func__, pe->phb->global_number, pe->addr);
return; return;
...@@ -820,7 +820,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe) ...@@ -820,7 +820,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe)
*/ */
if (result == PCI_ERS_RESULT_NONE) { if (result == PCI_ERS_RESULT_NONE) {
pr_info("EEH: Reset with hotplug activity\n"); pr_info("EEH: Reset with hotplug activity\n");
rc = eeh_reset_device(pe, frozen_bus, NULL); rc = eeh_reset_device(pe, bus, NULL);
if (rc) { if (rc) {
pr_warn("%s: Unable to reset, err=%d\n", pr_warn("%s: Unable to reset, err=%d\n",
__func__, rc); __func__, rc);
...@@ -938,7 +938,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe) ...@@ -938,7 +938,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe)
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(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;
......
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