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

Commit 4b1da898 authored by Jordan Crouse's avatar Jordan Crouse
Browse files

rpmsg: glink: Fix string format warnings 



Fix these string format warnings:

 drivers/rpmsg/qcom_glink_native.c: In function 'qcom_glink_advertise_intent':
 drivers/rpmsg/qcom_glink_native.c:38:34: error:
   format '%d' expects argument of type 'int', but argument 8 has type 'size_t {aka long unsigned int}' [-Werror=format=]
 drivers/rpmsg/qcom_glink_native.c:720:2: note: in expansion of macro 'CH_INFO'

 drivers/rpmsg/qcom_glink_native.c: In function 'qcom_glink_handle_intent':
 drivers/rpmsg/qcom_glink_native.c:38:34: error:
   format '%d' expects argument of type 'int', but argument 8 has type 'size_t {aka long unsigned int}'
 drivers/rpmsg/qcom_glink_native.c:1027:3: note: in expansion of macro 'CH_INFO'

 drivers/rpmsg/qcom_glink_native.c: In function 'qcom_glink_request_intent':
 drivers/rpmsg/qcom_glink_native.c:38:34: error:
   format '%d' expects argument of type 'int', but argument 7 has type 'size_t {aka long unsigned int}'
 drivers/rpmsg/qcom_glink_native.c:1385:2: note: in expansion of macro 'CH_INFO'

 drivers/rpmsg/qcom_glink_native.c: In function 'qcom_glink_native_probe':
 drivers/rpmsg/qcom_glink_native.c:1866:16: error:
   format '%d' expects argument of type 'int', but argument 3 has type 'long int' [-Werror=format=]

Fixes: d064080d ("rpmsg: Add snapshot of RPMSG Glink drivers")
Change-Id: Ic0dedbad9a9f827665325c43d3599036204fab37
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent 02b92966

drivers/rpmsg/qcom_glink_native.c

+5 −4
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static int qcom_glink_advertise_intent(struct qcom_glink *glink, 
	cmd.size = cpu_to_le32(intent->size);

	cmd.liid = cpu_to_le32(intent->id);



	CH_INFO(channel, "count:%d size:%d liid:%d\n", 1,

	CH_INFO(channel, "count:%d size:%zd liid:%d\n", 1,

		intent->size, intent->id);



	qcom_glink_tx(glink, &cmd, sizeof(cmd), NULL, 0, true);
@@ -1024,7 +1024,8 @@ static void qcom_glink_handle_intent(struct qcom_glink *glink, 
		intent->id = le32_to_cpu(msg->intents[i].iid);

		intent->size = le32_to_cpu(msg->intents[i].size);



		CH_INFO(channel, "riid:%d size:%d\n", intent->id, intent->size);

		CH_INFO(channel, "riid:%d size:%zd\n",

			intent->id, intent->size);



		spin_lock_irqsave(&channel->intent_lock, flags);

		ret = idr_alloc(&channel->riids, intent,
@@ -1382,7 +1383,7 @@ static int qcom_glink_request_intent(struct qcom_glink *glink, 
	cmd.cid = channel->lcid;

	cmd.size = size;



	CH_INFO(channel, "size:%d\n", size);

	CH_INFO(channel, "size:%zd\n", size);



	ret = qcom_glink_tx(glink, &cmd, sizeof(cmd), NULL, 0, true);

	if (ret)
@@ -1863,7 +1864,7 @@ struct qcom_glink *qcom_glink_native_probe(struct device *dev, 
	glink->task = kthread_run(kthread_worker_fn, &glink->kworker,

				  "glink_%s", glink->name);

	if (IS_ERR(glink->task)) {

		dev_err(dev, "failed to spawn intent kthread %d\n",

		dev_err(dev, "failed to spawn intent kthread %ld\n",

			PTR_ERR(glink->task));

		return ERR_CAST(glink->task);

	}