Skip to content

Commit cd95f80

Browse files
sambltcmpe
authored andcommitted
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: Sam Bobroff <[email protected]> Reviewed-by: Alexey Kardashevskiy <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent 5b86ac9 commit cd95f80

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

arch/powerpc/kernel/eeh_driver.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -754,14 +754,14 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
754754
*/
755755
void eeh_handle_normal_event(struct eeh_pe *pe)
756756
{
757-
struct pci_bus *frozen_bus;
757+
struct pci_bus *bus;
758758
struct eeh_dev *edev, *tmp;
759759
int rc = 0;
760760
enum pci_ers_result result = PCI_ERS_RESULT_NONE;
761761
struct eeh_rmv_data rmv_data = {LIST_HEAD_INIT(rmv_data.edev_list), 0};
762762

763-
frozen_bus = eeh_pe_bus_get(pe);
764-
if (!frozen_bus) {
763+
bus = eeh_pe_bus_get(pe);
764+
if (!bus) {
765765
pr_err("%s: Cannot find PCI bus for PHB#%x-PE#%x\n",
766766
__func__, pe->phb->global_number, pe->addr);
767767
return;
@@ -820,7 +820,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe)
820820
*/
821821
if (result == PCI_ERS_RESULT_NONE) {
822822
pr_info("EEH: Reset with hotplug activity\n");
823-
rc = eeh_reset_device(pe, frozen_bus, NULL);
823+
rc = eeh_reset_device(pe, bus, NULL);
824824
if (rc) {
825825
pr_warn("%s: Unable to reset, err=%d\n",
826826
__func__, rc);
@@ -938,7 +938,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe)
938938
eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
939939

940940
pci_lock_rescan_remove();
941-
pci_hp_remove_devices(frozen_bus);
941+
pci_hp_remove_devices(bus);
942942
pci_unlock_rescan_remove();
943943
/* The passed PE should no longer be used */
944944
return;

0 commit comments

Comments
 (0)