Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[platform/kernel/linux-rpi.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 0df6e05..da864d1 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_rdma.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_rdma.c
@@ -1152,7 +1152,6 @@ qed_rdma_destroy_cq(void *rdma_cxt,
        DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", in_params->icid);
 
        p_ramrod_res =
-           (struct rdma_destroy_cq_output_params *)
            dma_alloc_coherent(&p_hwfn->cdev->pdev->dev,
                               sizeof(struct rdma_destroy_cq_output_params),
                               &ramrod_res_phys, GFP_KERNEL);
@@ -1464,14 +1463,14 @@ static int qed_rdma_modify_qp(void *rdma_cxt,
 
        switch (qp->qp_type) {
        case QED_RDMA_QP_TYPE_XRC_INI:
-               qp->has_req = 1;
+               qp->has_req = true;
                break;
        case QED_RDMA_QP_TYPE_XRC_TGT:
-               qp->has_resp = 1;
+               qp->has_resp = true;
                break;
        default:
-               qp->has_req = 1;
-               qp->has_resp = 1;
+               qp->has_req  = true;
+               qp->has_resp = true;
        }
 
        if (QED_IS_IWARP_PERSONALITY(p_hwfn)) {