openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Oliver O'Halloran 2020-07-25 18:12:25 +10:00 committed by Michael Ellerman
parent 0c2c76523c
commit 8225d543dc
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -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;
}

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

@ -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;

4
arch/powerpc/platforms/pseries/eeh_pseries.c
View File

@ -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;