Commit 8225d543 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

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: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200725081231.39076-8-oohall@gmail.com
parent 0c2c7652

arch/powerpc/include/asm/eeh.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/kernel/eeh_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

arch/powerpc/kernel/eeh_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/platforms/pseries/eeh_pseries.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE