powerpc/eeh: Pass eeh_dev to eeh_ops->resume_notify()

Mechanical conversion of the eeh_ops interfaces to use eeh_dev to reference
a specific device rather than pci_dn. No functional changes.

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-8-oohall@gmail.com

diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index c23c8fd5229db20ab0e57d1876d1d7af24470f18..73e6a73a36847b0a055bd8d48a8da40321e96bd0 100644 (file)
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -230,7 +230,7 @@ struct eeh_ops {
        int (*write_config)(struct pci_dn *pdn, int where, int size, u32 val);
        int (*next_error)(struct eeh_pe **pe);
        int (*restore_config)(struct eeh_dev *edev);
-       int (*notify_resume)(struct pci_dn *pdn);
+       int (*notify_resume)(struct eeh_dev *edev);
 };
 
 extern int eeh_subsystem_flags;

diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index b70b9273f45a5270376b040755be15430abcbdc9..b84d3cb2532e2e66fe292f239817f8b0d23fce7f 100644 (file)
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -425,8 +425,8 @@ static enum pci_ers_result eeh_report_resume(struct eeh_dev *edev,
 
        pci_uevent_ers(edev->pdev, PCI_ERS_RESULT_RECOVERED);
 #ifdef CONFIG_PCI_IOV
-       if (eeh_ops->notify_resume && eeh_dev_to_pdn(edev))
-               eeh_ops->notify_resume(eeh_dev_to_pdn(edev));
+       if (eeh_ops->notify_resume)
+               eeh_ops->notify_resume(edev);
 #endif
        return PCI_ERS_RESULT_NONE;
 }

diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c
index 4fb0f1e1017a9e64004b09c6bac065f27b816e10..429620da73baa5af302d1221f32eb0c5d3a8d372 100644 (file)
--- a/arch/powerpc/kernel/eeh_sysfs.c
+++ b/arch/powerpc/kernel/eeh_sysfs.c
@@ -99,7 +99,7 @@ static ssize_t eeh_notify_resume_store(struct device *dev,
        if (!edev || !edev->pe || !eeh_ops->notify_resume)
                return -ENODEV;
 
-       if (eeh_ops->notify_resume(pci_get_pdn(pdev)))
+       if (eeh_ops->notify_resume(edev))
                return -EIO;
 
        return count;

diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c
index e32b49ead31371cf593264a7744b6f884b9ee9df..57de8acad5f5a8eff5bc68a30bc12a90fae894fe 100644 (file)
--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
@@ -899,10 +899,8 @@ static int pseries_call_allow_unfreeze(struct eeh_dev *edev)
        return rc;
 }
 
-static int pseries_notify_resume(struct pci_dn *pdn)
+static int pseries_notify_resume(struct eeh_dev *edev)
 {
-       struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
-
        if (!edev)
                return -EEXIST;