Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 812d8672 authored by Or Gerlitz's avatar Or Gerlitz Committed by Roland Dreier
Browse files

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: default avatarOr Gerlitz <ogerlitz@voltaire.com>
Acked-by: default avatarChien Tung <chien.tin.tung@intel.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent cd6860eb

drivers/infiniband/hw/nes/nes_cm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2565,7 +2565,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp) 
	u16 last_ae;

	u16 last_ae;

	u8 original_hw_tcp_state;

	u8 original_hw_tcp_state;

	u8 original_ibqp_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_disconn = 0;

	int issue_close = 0;

	int issue_close = 0;

	int issue_flush = 0;

	int issue_flush = 0;

drivers/infiniband/hw/nes/nes_verbs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1941,7 +1941,7 @@ static int nes_reg_mr(struct nes_device *nesdev, struct nes_pd *nespd, 
	u8  use_256_pbls = 0;

	u8  use_256_pbls = 0;

	u8  use_4k_pbls = 0;

	u8  use_4k_pbls = 0;

	u16 use_two_level = (pbl_count_4k > 1) ? 1 : 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;

	u32 opcode = 0;

	u16 major_code;

	u16 major_code;