summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Hsu <hsuvictor@google.com>2021-11-26 16:20:36 +0800
committerVictor Hsu <hsuvictor@google.com>2021-12-13 13:40:00 +0800
commit749813d67d19088575e70e142343b60ffc1bd482 (patch)
tree246b38a1b7f5124e5f09326d9f450030c7c05e63
parent84364e386a0abebdf85e149073ec8e040b05800a (diff)
downloadcnss2-749813d67d19088575e70e142343b60ffc1bd482.tar.gz
wcn6740: Format specifies type does not match the argument type
The [-Werror,-Wformat] compiler option is enabled. Fix the compiler errors that format specifies type does not match the argument type. Bug: 207814349 Signed-off-by: Victor Hsu <hsuvictor@google.com> Change-Id: Ifdab57c1c24d9c8b3888daa15700dea596e4a451
-rw-r--r--cnss_prealloc/cnss_prealloc.c4
-rw-r--r--mhi/core/main.c4
-rw-r--r--mhi/core/misc.c14
-rw-r--r--qrtr/qrtr.c2
4 files changed, 12 insertions, 12 deletions
diff --git a/cnss_prealloc/cnss_prealloc.c b/cnss_prealloc/cnss_prealloc.c
index 77c4497..1a29d91 100644
--- a/cnss_prealloc/cnss_prealloc.c
+++ b/cnss_prealloc/cnss_prealloc.c
@@ -115,7 +115,7 @@ static int cnss_pool_init(void)
continue;
}
- pr_info("cnss_prealloc: created mempool %s of min size %d * %d\n",
+ pr_info("cnss_prealloc: created mempool %s of min size %d * %zu\n",
cnss_pools[i].name, cnss_pools[i].min,
cnss_pools[i].size);
}
@@ -212,7 +212,7 @@ void *wcnss_prealloc_get(size_t size)
}
if (!mem && size >= cnss_pool_alloc_threshold()) {
- pr_debug("cnss_prealloc: not available for size %d, flag %x\n",
+ pr_debug("cnss_prealloc: not available for size %zu, flag %x\n",
size, gfp_mask);
}
diff --git a/mhi/core/main.c b/mhi/core/main.c
index 75ada8f..ed3f8a4 100644
--- a/mhi/core/main.c
+++ b/mhi/core/main.c
@@ -809,7 +809,7 @@ static void mhi_process_cmd_completion(struct mhi_controller *mhi_cntrl,
cmd_pkt = mhi_to_virtual(mhi_ring, ptr);
if (cmd_pkt != mhi_ring->rp)
- panic("Out of order cmd completion: 0x%llx. Expected: 0x%llx\n",
+ panic("Out of order cmd completion: 0x%p. Expected: 0x%p\n",
cmd_pkt, mhi_ring->rp);
if (MHI_TRE_GET_CMD_TYPE(cmd_pkt) == MHI_CMD_SFR_CFG) {
@@ -1316,7 +1316,7 @@ int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
mhi_tre->dword[0] = MHI_TRE_DATA_DWORD0(info->len);
mhi_tre->dword[1] = MHI_TRE_DATA_DWORD1(bei, eot, eob, chain);
- MHI_VERB("Channel: %d WP: 0x%llx TRE: 0x%llx 0x%08x 0x%08x\n",
+ MHI_VERB("Channel: %d WP: 0x%p TRE: 0x%llx 0x%08x 0x%08x\n",
mhi_chan->chan, mhi_tre, mhi_tre->ptr, mhi_tre->dword[0],
mhi_tre->dword[1]);
diff --git a/mhi/core/misc.c b/mhi/core/misc.c
index 03792de..9c163eb 100644
--- a/mhi/core/misc.c
+++ b/mhi/core/misc.c
@@ -73,7 +73,7 @@ static void mhi_time_async_cb(struct mhi_device *mhi_dev, u32 sequence,
struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
struct device *dev = &mhi_dev->dev;
- MHI_LOG("Time response: seq:%llx local: %llu remote: %llu (ticks)\n",
+ MHI_LOG("Time response: seq:%x local: %llu remote: %llu (ticks)\n",
sequence, local_time, remote_time);
}
@@ -91,13 +91,13 @@ static ssize_t time_async_show(struct device *dev,
ret = mhi_get_remote_time(mhi_dev, seq, &mhi_time_async_cb);
if (ret) {
- MHI_ERR("Failed to request time, seq:%llx, ret:%d\n", seq, ret);
+ MHI_ERR("Failed to request time, seq:%x, ret:%d\n", seq, ret);
return scnprintf(buf, PAGE_SIZE,
"Request failed or feature unsupported\n");
}
return scnprintf(buf, PAGE_SIZE,
- "Requested time asynchronously with seq:%llx\n", seq);
+ "Requested time asynchronously with seq:%x\n", seq);
}
static DEVICE_ATTR_RO(time_async);
@@ -332,7 +332,7 @@ int mhi_report_error(struct mhi_controller *mhi_cntrl)
/* copy subsystem failure reason string if supported */
if (sfr_info && sfr_info->buf_addr) {
memcpy(sfr_info->str, sfr_info->buf_addr, sfr_info->len);
- MHI_ERR("mhi: %s sfr: %s\n", dev_name(dev), sfr_info->buf_addr);
+ MHI_ERR("mhi: %s sfr: %s\n", dev_name(dev), sfr_info->str);
}
/* Notify fatal error to all client drivers to halt processing */
@@ -1130,7 +1130,7 @@ int mhi_process_misc_tsync_ev_ring(struct mhi_controller *mhi_cntrl,
sequence = MHI_TRE_GET_EV_SEQ(dev_rp);
remote_time = MHI_TRE_GET_EV_TIME(dev_rp);
- MHI_VERB("Received TSYNC event with seq: 0x%llx time: 0x%llx\n",
+ MHI_VERB("Received TSYNC event with seq: 0x%x time: 0x%llx\n",
sequence, remote_time);
read_lock_bh(&mhi_cntrl->pm_lock);
@@ -1142,7 +1142,7 @@ int mhi_process_misc_tsync_ev_ring(struct mhi_controller *mhi_cntrl,
mutex_lock(&mhi_tsync->mutex);
if (WARN_ON(mhi_tsync->int_sequence != sequence)) {
- MHI_ERR("Unexpected response: 0x%llx Expected: 0x%llx\n",
+ MHI_ERR("Unexpected response: 0x%x Expected: 0x%x\n",
sequence, mhi_tsync->int_sequence);
mhi_cntrl->runtime_put(mhi_cntrl);
@@ -1648,7 +1648,7 @@ int mhi_get_remote_time(struct mhi_device *mhi_dev,
mhi_tsync->lpm_enable(mhi_cntrl);
- MHI_VERB("time DB request with seq:0x%llx\n", mhi_tsync->int_sequence);
+ MHI_VERB("time DB request with seq:0x%x\n", mhi_tsync->int_sequence);
mhi_tsync->db_pending = true;
init_completion(&mhi_tsync->completion);
diff --git a/qrtr/qrtr.c b/qrtr/qrtr.c
index 96a1b6d..0efe367 100644
--- a/qrtr/qrtr.c
+++ b/qrtr/qrtr.c
@@ -1158,7 +1158,7 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int net_id,
struct sched_param param = {.sched_priority = 1};
if (!ep || !ep->xmit){
- pr_err("%s: error qrtr ep=%x ex->xmit=%x\n",
+ pr_err("%s: error qrtr ep=%p ex->xmit=%p\n",
__func__, ep,ep->xmit);
return -EINVAL;