RDMA/nes: Fix two sparse warnings

Simple changes to fix warnings:

      CHECK   drivers/infiniband/hw/nes/nes_verbs.c
    nes_verbs.c:1944:45: warning: Using plain integer as NULL pointer
    nes_verbs.c:1944:48: warning: Using plain integer as NULL pointer
      CHECK   drivers/infiniband/hw/nes/nes_cm.c
    nes_cm.c:2645:43: warning: mixing different enum types
    nes_cm.c:2645:43:     int enum iw_cm_event_type  versus
    nes_cm.c:2645:43:     int enum iw_cm_event_status

Signed-off-by: Or Gerlitz <ogerlitz@voltaire.com>
Acked-by: Chien Tung <chien.tin.tung@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 986d6f32ddedf8ac0d225aca4a61321469f1d3a1..d400fa9de8b820e83d94640642387c3c0e0cf285 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -2565,7 +2565,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
        u16 last_ae;
        u8 original_hw_tcp_state;
        u8 original_ibqp_state;
-       enum iw_cm_event_type disconn_status = IW_CM_EVENT_STATUS_OK;
+       enum iw_cm_event_status disconn_status = IW_CM_EVENT_STATUS_OK;
        int issue_disconn = 0;
        int issue_close = 0;
        int issue_flush = 0;

diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 3b95d0473b70758ad9aaf39a0267473e582b9a28..3b50dc521b979a8f0013aea1d3f29696d26e8982 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -1941,7 +1941,7 @@ static int nes_reg_mr(struct nes_device *nesdev, struct nes_pd *nespd,
        u8  use_256_pbls = 0;
        u8  use_4k_pbls = 0;
        u16 use_two_level = (pbl_count_4k > 1) ? 1 : 0;
-       struct nes_root_vpbl new_root = {0, 0, 0};
+       struct nes_root_vpbl new_root = { 0, NULL, NULL };
        u32 opcode = 0;
        u16 major_code;