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

Commit 014f182b authored by Jordan Crouse's avatar Jordan Crouse
Browse files

cnss2: Fix compile warnings 



Fix the following compiler warning(s) from gcc 6.1.1 with -Werror enabled:

 drivers/net/wireless/cnss2/qmi.c:1678:
   format '%llx' expects argument of type 'long long unsigned int', but
	argument 3 has type 'long unsigned int' [-Werror=format=]
  cnss_pr_dbg("COEX Server Connected: 0x%llx\n",

 drivers/net/wireless/cnss2/qmi.c:1449:
   format '%zx' expects argument of type 'size_t', but argument 3 has
	type 'u32 {aka const unsigned int}' [-Werror=format=]
   cnss_pr_dbg("QDSS requests for memory, size: 0x%zx, type: %u\n",

 drivers/net/wireless/cnss2/power.c:101:
   return type defaults to 'int' [-Werror=return-type]
 static cnss_vreg_on_single(struct cnss_vreg_info *vreg)

 drivers/net/wireless/cnss2/main.c:1224:
   format '%p' expects argument of type 'void *', but argument 3 has type
	'u64 {aka long long unsigned int}' [-Werror=format=]
   cnss_pr_err("Fail to find matching va for pa %pa\n",

Fixes: 659d5f3f ("cnss2: Add support for coexistence QMI service")
Fixes: 36d1fba9 ("cnss2: Add support for QDSS trace collecting")
Fixes: 90fde779 ("cnss2: Re-arch power related APIs")
Change-Id: Ic0dedbadaa37d758443d7b46eea9446ca7442c57
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent e62ea311

drivers/net/wireless/cnss2/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ static int cnss_qdss_trace_save_hdlr(struct cnss_plat_data *plat_priv, 
						      size, &seg_id);

			if (!va) {

				cnss_pr_err("Fail to find matching va for pa %pa\n",

					    pa);

					    &pa);

				ret = -EINVAL;

				break;

			}

drivers/net/wireless/cnss2/power.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void cnss_put_vreg_single(struct cnss_plat_data *plat_priv, 
	devm_kfree(dev, vreg);

}



static cnss_vreg_on_single(struct cnss_vreg_info *vreg)

static int cnss_vreg_on_single(struct cnss_vreg_info *vreg)

{

	int ret = 0;

drivers/net/wireless/cnss2/qmi.c

+2 −2
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ static void cnss_wlfw_qdss_trace_req_mem_ind_cb(struct qmi_handle *qmi_wlfw, 


	plat_priv->qdss_mem_seg_len = ind_msg->mem_seg_len;

	for (i = 0; i < plat_priv->qdss_mem_seg_len; i++) {

		cnss_pr_dbg("QDSS requests for memory, size: 0x%zx, type: %u\n",

		cnss_pr_dbg("QDSS requests for memory, size: 0x%x, type: %u\n",

			    ind_msg->mem_seg[i].size, ind_msg->mem_seg[i].type);

		plat_priv->qdss_mem[i].type = ind_msg->mem_seg[i].type;

		plat_priv->qdss_mem[i].size = ind_msg->mem_seg[i].size;
@@ -1902,7 +1902,7 @@ static int coex_new_server(struct qmi_handle *qmi, 
	}



	set_bit(CNSS_COEX_CONNECTED, &plat_priv->driver_state);

	cnss_pr_dbg("COEX Server Connected: 0x%llx\n",

	cnss_pr_dbg("COEX Server Connected: 0x%lx\n",

		    plat_priv->driver_state);

	return 0;

}