renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-23 22:25:40 +08:00
Code

powerpc/eeh: Delete eeh_pe->config_addr

Browse Source 
The eeh_pe->config_addr field was supposed to be removed in
commit 35d64734b6 ("powerpc/eeh: Clean up PE addressing") which made it
largely unused. Finish the job.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201007040903.819081-1-oohall@gmail.com
This commit is contained in:
Oliver O'Halloran 2020-10-07 15:09:02 +11:00 committed by Michael Ellerman
parent 72cdd117c4
commit 269e583357
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/include/asm/eeh.h
View File

@ -73,7 +73,6 @@ struct pci_dn;
struct eeh_pe { struct eeh_pe {
int type; /* PE type: PHB/Bus/Device */ int type; /* PE type: PHB/Bus/Device */
int state; /* PE EEH dependent mode */ int state; /* PE EEH dependent mode */
int config_addr; /* Traditional PCI address */
int addr; /* PE configuration address */ int addr; /* PE configuration address */
struct pci_controller *phb; /* Associated PHB */ struct pci_controller *phb; /* Associated PHB */
struct pci_bus *bus; /* Top PCI bus for bus PE */ struct pci_bus *bus; /* Top PCI bus for bus PE */

2
arch/powerpc/kernel/eeh.c
View File

@ -466,7 +466,7 @@ int eeh_dev_check_failure(struct eeh_dev *edev)
return 0; return 0;
} }
if (!pe->addr && !pe->config_addr) { if (!pe->addr) {
eeh_stats.no_cfg_addr++; eeh_stats.no_cfg_addr++;
return 0; return 0;
} }

4
arch/powerpc/kernel/eeh_pe.c
View File

@ -354,8 +354,8 @@ int eeh_pe_tree_insert(struct eeh_dev *edev, struct eeh_pe *new_pe_parent)
pr_err("%s: out of memory!\n", __func__); pr_err("%s: out of memory!\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
pe->addr = edev->pe_config_addr;
pe->config_addr = edev->bdfn; pe->addr = edev->pe_config_addr;
/* /*
* Put the new EEH PE into hierarchy tree. If the parent * Put the new EEH PE into hierarchy tree. If the parent