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

Commit d926d6e2 authored by Jordan Crouse's avatar Jordan Crouse
Browse files

msm: cvp: Fix compile warnings in msm_cvp_common.c 



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

 drivers/media/platform/msm/cvp/msm_cvp_common.c:608:
   format '%d' expects argument of type 'int', but argument 4 has type 'struct msm_cvp_inst *' [-Werror=format=]
   dprintk(CVP_DBG, "%s: inst=%d\n", __func__, inst);

 drivers/media/platform/msm/cvp/msm_cvp_common.c:2158:
   format '%s' expects a matching 'char *' argument [-Werror=format=]
   dprintk(CVP_ERR,

 drivers/media/platform/msm/cvp/msm_cvp_common.c:2826:
   'e' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   msm_cvp_debugfs_update(inst, e);

Fixes: 9b628d2a ("msm: cvp: Add Qualcomm CVP driver for Kona")
Change-Id: Ic0dedbadd44ad9bd46b60ad0acb4b62ed7f2768f
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent 59eb6135

drivers/media/platform/msm/cvp/msm_cvp_common.c

+3 −3
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static void cvp_handle_session_dfs_cmd_done(enum hal_command_response cmd, 
		return;

	}



	dprintk(CVP_DBG, "%s: inst=%d\n", __func__, inst);

	dprintk(CVP_DBG, "%s: inst=%pK\n", __func__, inst);



	if (IS_HAL_SESSION_CMD(cmd)) {

		dprintk(CVP_INFO, "%s: calling completion for id=%d",
@@ -2179,7 +2179,7 @@ static int msm_comm_init_buffer_count(struct msm_cvp_inst *inst) 
		bufreq->buffer_count_actual, HAL_BUFFER_OUTPUT);

	if (rc) {

		dprintk(CVP_ERR,

			"%s: Failed to set out buffer count to FW\n");

			"Failed to set out buffer count to FW\n");

		return -EINVAL;

	}
@@ -2790,7 +2790,7 @@ static int msm_comm_qbuf_to_hfi(struct msm_cvp_inst *inst, 
{

	int rc = 0;

	struct hfi_device *hdev;

	enum msm_cvp_debugfs_event e;

	enum msm_cvp_debugfs_event e = { 0 };

	struct cvp_frame_data frame_data = {0};



	if (!inst || !inst->core || !inst->core->device || !mbuf) {