Unverified Commit 1bd33bfb authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10998 PCI: endpoint: pci-epf-test: Make use of cached 'epc_features' in pci_epf_test_core_init() 

Merge Pull Request from: @ci-robot 
 
PR sync from: liwei <liwei728@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2BFY6543GFRNNT7CWRP55MGSILMOKBQN/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ5P 
 
Link:https://gitee.com/openeuler/kernel/pulls/10998

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents eccf28ee 632a465e

drivers/pci/endpoint/functions/pci-epf-test.c

+3 −11
Original line number Diff line number Diff line
@@ -750,19 +750,11 @@ static int pci_epf_test_core_init(struct pci_epf *epf) 
{

	struct pci_epf_test *epf_test = epf_get_drvdata(epf);

	struct pci_epf_header *header = epf->header;

	const struct pci_epc_features *epc_features;

	const struct pci_epc_features *epc_features = epf_test->epc_features;

	struct pci_epc *epc = epf->epc;

	struct device *dev = &epf->dev;

	bool msix_capable = false;

	bool msi_capable = true;

	int ret;



	epc_features = pci_epc_get_features(epc, epf->func_no, epf->vfunc_no);

	if (epc_features) {

		msix_capable = epc_features->msix_capable;

		msi_capable = epc_features->msi_capable;

	}



	if (epf->vfunc_no <= 1) {

		ret = pci_epc_write_header(epc, epf->func_no, epf->vfunc_no, header);

		if (ret) {
@@ -775,7 +767,7 @@ static int pci_epf_test_core_init(struct pci_epf *epf) 
	if (ret)

		return ret;



	if (msi_capable) {

	if (epc_features->msi_capable) {

		ret = pci_epc_set_msi(epc, epf->func_no, epf->vfunc_no,

				      epf->msi_interrupts);

		if (ret) {
@@ -784,7 +776,7 @@ static int pci_epf_test_core_init(struct pci_epf *epf) 
		}

	}



	if (msix_capable) {

	if (epc_features->msix_capable) {

		ret = pci_epc_set_msix(epc, epf->func_no, epf->vfunc_no,

				       epf->msix_interrupts,

				       epf_test->test_reg_bar,