powerpc/eeh: Remove class code field from edev

The edev->class_code field is never referenced anywhere except for the
platform specific probe functions. The same information is available in
the pci_dev for PowerNV and in the pci_dn on pseries so we can remove
the field.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200725081231.39076-11-oohall@gmail.com

diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index f8ef27f75c37563df60519720bbc3e4330b33be6..79de8624809a75f1d5089d10e1650fc879f798da 100644 (file)
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -133,7 +133,6 @@ static inline bool eeh_pe_passed(struct eeh_pe *pe)
 
 struct eeh_dev {
        int mode;                       /* EEH mode                     */
-       int class_code;                 /* Class code of the device     */
        int bdfn;                       /* bdfn of device (for cfg ops) */
        struct pci_controller *controller;
        int pe_config_addr;             /* PE config address            */

diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index c9f2f454d0530326e6ff6efd80338bcbb5c5c480..7cbb03a97a61cacabfe2524be601d948b267fcf9 100644 (file)
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -372,19 +372,18 @@ static struct eeh_dev *pnv_eeh_probe(struct pci_dev *pdev)
        }
 
        /* Skip for PCI-ISA bridge */
-       if ((pdn->class_code >> 8) == PCI_CLASS_BRIDGE_ISA)
+       if ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
                return NULL;
 
        eeh_edev_dbg(edev, "Probing device\n");
 
        /* Initialize eeh device */
-       edev->class_code = pdn->class_code;
        edev->mode      &= 0xFFFFFF00;
        edev->pcix_cap = pnv_eeh_find_cap(pdn, PCI_CAP_ID_PCIX);
        edev->pcie_cap = pnv_eeh_find_cap(pdn, PCI_CAP_ID_EXP);
        edev->af_cap   = pnv_eeh_find_cap(pdn, PCI_CAP_ID_AF);
        edev->aer_cap  = pnv_eeh_find_ecap(pdn, PCI_EXT_CAP_ID_ERR);
-       if ((edev->class_code >> 8) == PCI_CLASS_BRIDGE_PCI) {
+       if ((pdev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
                edev->mode |= EEH_DEV_BRIDGE;
                if (edev->pcie_cap) {
                        pnv_pci_cfg_read(pdn, edev->pcie_cap + PCI_EXP_FLAGS,

diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c
index 53e5381b3d536d4502c968e7932563272769c556..902b929ef307e24d2f4afa5993e7436345e1d29f 100644 (file)
--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
@@ -440,12 +440,11 @@ void pseries_eeh_init_edev(struct pci_dn *pdn)
         * correctly reflects that current device is root port
         * or PCIe switch downstream port.
         */
-       edev->class_code = pdn->class_code;
        edev->pcix_cap = pseries_eeh_find_cap(pdn, PCI_CAP_ID_PCIX);
        edev->pcie_cap = pseries_eeh_find_cap(pdn, PCI_CAP_ID_EXP);
        edev->aer_cap = pseries_eeh_find_ecap(pdn, PCI_EXT_CAP_ID_ERR);
        edev->mode &= 0xFFFFFF00;
-       if ((edev->class_code >> 8) == PCI_CLASS_BRIDGE_PCI) {
+       if ((pdn->class_code >> 8) == PCI_CLASS_BRIDGE_PCI) {
                edev->mode |= EEH_DEV_BRIDGE;
                if (edev->pcie_cap) {
                        rtas_read_config(pdn, edev->pcie_cap + PCI_EXP_FLAGS,