Imported Upstream version 17.05

[deb_dpdk.git] / drivers / net / bnxt / bnxt_ring.c

diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index 3f81ffc..0fafa13 100644 (file)
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -209,6 +209,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
  */
 int bnxt_alloc_hwrm_rings(struct bnxt *bp)
 {
+       struct rte_pci_device *pci_dev = bp->pdev;
        unsigned int i;
        int rc = 0;
 
@@ -222,8 +223,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                                          0, HWRM_NA_SIGNATURE);
                if (rc)
                        goto err_out;
-               cpr->cp_doorbell =
-                   (char *)bp->eth_dev->pci_dev->mem_resource[2].addr;
+               cpr->cp_doorbell = pci_dev->mem_resource[2].addr;
                B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
                bp->grp_info[0].cp_fw_ring_id = cp_ring->fw_ring_id;
        }
@@ -242,8 +242,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                                        idx, HWRM_NA_SIGNATURE);
                if (rc)
                        goto err_out;
-               cpr->cp_doorbell =
-                   (char *)bp->eth_dev->pci_dev->mem_resource[2].addr +
+               cpr->cp_doorbell = (char *)pci_dev->mem_resource[2].addr +
                    idx * 0x80;
                bp->grp_info[idx].cp_fw_ring_id = cp_ring->fw_ring_id;
                B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
@@ -255,8 +254,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                if (rc)
                        goto err_out;
                rxr->rx_prod = 0;
-               rxr->rx_doorbell =
-                   (char *)bp->eth_dev->pci_dev->mem_resource[2].addr +
+               rxr->rx_doorbell = (char *)pci_dev->mem_resource[2].addr +
                    idx * 0x80;
                bp->grp_info[idx].rx_fw_ring_id = ring->fw_ring_id;
                B_RX_DB(rxr->rx_doorbell, rxr->rx_prod);
@@ -283,8 +281,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                if (rc)
                        goto err_out;
 
-               cpr->cp_doorbell =
-                   (char *)bp->eth_dev->pci_dev->mem_resource[2].addr +
+               cpr->cp_doorbell = (char *)pci_dev->mem_resource[2].addr +
                    idx * 0x80;
                bp->grp_info[idx].cp_fw_ring_id = cp_ring->fw_ring_id;
                B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
@@ -296,8 +293,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                if (rc)
                        goto err_out;
 
-               txr->tx_doorbell =
-                   (char *)bp->eth_dev->pci_dev->mem_resource[2].addr +
+               txr->tx_doorbell = (char *)pci_dev->mem_resource[2].addr +
                    idx * 0x80;
        }