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

Commit 1d790b7b authored by Jordan Crouse's avatar Jordan Crouse Committed by Sumukh Hallymysore Ravindra
Browse files

msm: synx: Fix compile warnings 



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

 drivers/media/platform/msm/synx/synx.c:117:
   format '%ld' expects argument of type 'long int', but argument 4
     has type 's32 {aka int}' [-Werror=format=]
  pr_debug("row: synx id: 0x%x, index: %ld\n",

 drivers/media/platform/msm/synx/synx.c:398:
   format '%ld' expects argument of type 'long int', but argument 4
     has type 's32 {aka int}' [-Werror=format=]
  pr_debug("row (merged): synx 0x%x, index: %ld\n",

 drivers/media/platform/msm/synx/synx.c:1059:
   format '%d' expects argument of type 'int', but argument 4
     has type 'struct synx_external_desc' [-Werror=format=]
  pr_debug("calling synx_bind: 0x%x, %d\n", synx_bind_info.synx_obj,

 drivers/media/platform/msm/synx/synx.c:334:
   this 'if' clause does not guard... [-Werror=misleading-indentation]
     if (ret < 0) {

Fixes: fdf150a6 ("msm: global synchronization driver")
Fixes: 3c6ef89f ("msm: synx: provide function to enable external signaling")
Change-Id: Ic0dedbad58ce9d2db00e37f6baafdfa56b058ca1
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarSumukh Hallymysore Ravindra <shallymy@codeaurora.org>
parent aaa741f0

drivers/media/platform/msm/synx/synx.c

+6 −5
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ int synx_create(s32 *synx_obj, const char *name) 


	*synx_obj = row->synx_obj;



	pr_debug("row: synx id: 0x%x, index: %ld\n",

	pr_debug("row: synx id: 0x%x, index: %d\n",

		row->synx_obj, row->index);

	pr_debug("Exit %s\n", __func__);
@@ -327,13 +327,15 @@ int synx_signal_core(struct synx_table_row *row, u32 status) 
			pr_debug("signaling external sync: %d, status: %u\n",

				sync_id, status);

			/* optional function to enable external signaling */

			if (bind_ops->enable_signaling)

			if (bind_ops->enable_signaling) {

				ret = bind_ops->enable_signaling(sync_id);

				if (ret < 0) {

					pr_err("enable signaling fail on sync: %d, err: %d\n",

						sync_id, ret);

					continue;

				}

			}



			ret = bind_ops->signal(sync_id, status);

			if (ret < 0)

				pr_err("signaling fail on sync: %d, err: %d\n",
@@ -420,7 +422,7 @@ int synx_merge(s32 *synx_objs, u32 num_objs, s32 *synx_merged) 


	*synx_merged = row->synx_obj;



	pr_debug("row (merged): synx 0x%x, index: %ld\n",

	pr_debug("row (merged): synx 0x%x, index: %d\n",

		row->synx_obj, row->index);

	pr_debug("Exit %s\n", __func__);
@@ -1081,8 +1083,7 @@ static int synx_handle_bind(struct synx_private_ioctl_arg *k_ioctl) 
		k_ioctl->size))

		return -EFAULT;



	pr_debug("calling synx_bind: 0x%x, %d\n", synx_bind_info.synx_obj,

		synx_bind_info.ext_sync_desc);

	pr_debug("calling synx_bind: 0x%x\n", synx_bind_info.synx_obj);

	k_ioctl->result = synx_bind(synx_bind_info.synx_obj,

		synx_bind_info.ext_sync_desc);