bnx2x: Use pci_ari_enabled() instead of local copy

bjorn-helgaas · davem330 · commit d2746fe5380e · 2017-10-06T10:06:06.000-07:00
Use pci_ari_enabled() from the PCI core instead of the identical local copy
bnx2x_ari_enabled().  No functional change intended.

Signed-off-by: Bjorn Helgaas &lt;bhelgaas@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -1074,11 +1074,6 @@ static void bnx2x_vf_set_bars(struct bnx2x *bp, struct bnx2x_virtf *vf)
 	}
 }
 
-static int bnx2x_ari_enabled(struct pci_dev *dev)
-{
-	return dev->bus->self && dev->bus->self->ari_enabled;
-}
-
 static int
 bnx2x_get_vf_igu_cam_info(struct bnx2x *bp)
 {
@@ -1212,7 +1207,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,
 
 	err = -EIO;
 	/* verify ari is enabled */
-	if (!bnx2x_ari_enabled(bp->pdev)) {
+	if (!pci_ari_enabled(bp->pdev->bus)) {
 		BNX2X_ERR("ARI not supported (check pci bridge ARI forwarding), SRIOV can not be enabled\n");
 		return 0;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1074,11 +1074,6 @@ static void bnx2x_vf_set_bars(struct bnx2x bp, struct bnx2x_virtf vf)`
`1074`	`1074`	`}`
`1075`	`1075`	`}`
`1076`	`1076`
`1077`		`-static int bnx2x_ari_enabled(struct pci_dev *dev)`
`1078`		`-{`
`1079`		`- return dev->bus->self && dev->bus->self->ari_enabled;`
`1080`		`-}`
`1081`		`-`
`1082`	`1077`	`static int`
`1083`	`1078`	`bnx2x_get_vf_igu_cam_info(struct bnx2x *bp)`
`1084`	`1079`	`{`
`@@ -1212,7 +1207,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,`
`1212`	`1207`
`1213`	`1208`	`err = -EIO;`
`1214`	`1209`	`/* verify ari is enabled */`
`1215`		`- if (!bnx2x_ari_enabled(bp->pdev)) {`
	`1210`	`+ if (!pci_ari_enabled(bp->pdev->bus)) {`
`1216`	`1211`	`BNX2X_ERR("ARI not supported (check pci bridge ARI forwarding), SRIOV can not be enabled\n");`
`1217`	`1212`	`return 0;`
`1218`	`1213`	`}`