Merge branch 'odp_fixes' into rdma.git for-next

[linux-2.6-block.git] / drivers / net / ethernet / qlogic / qed / qed_rdma.c

diff --git a/drivers/net/ethernet/qlogic/qed/qed_rdma.c b/drivers/net/ethernet/qlogic/qed/qed_rdma.c
index 158ac07389118278766ae3c9836a13d8f5307981..38b1f402f7ed299c3bbaa7090c9336ddfa7062fb 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_rdma.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_rdma.c
@@ -798,9 +798,8 @@ static int qed_rdma_add_user(void *rdma_cxt,
        /* Calculate the corresponding DPI address */
        dpi_start_offset = p_hwfn->dpi_start_offset;
 
-       out_params->dpi_addr = (u64)((u8 __iomem *)p_hwfn->doorbells +
-                                    dpi_start_offset +
-                                    ((out_params->dpi) * p_hwfn->dpi_size));
+       out_params->dpi_addr = p_hwfn->doorbells + dpi_start_offset +
+                              out_params->dpi * p_hwfn->dpi_size;
 
        out_params->dpi_phys_addr = p_hwfn->db_phys_addr +
                                    dpi_start_offset +