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

Commit 3865c1c9 authored by Jigarkumar Zala's avatar Jigarkumar Zala Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: Remove function call in macro expansion 



Remove function call from CAM_ERR/CAM_INFO/CAM_WARN macros and
replace it with operation directly. This change will remove
overhead time of function call. Also, update affected modules
with this change.

Change-Id: I290cb445e5fb5dbb2414b4b2d9eb2f79992f77ec
Signed-off-by: default avatarJigarkumar Zala <jzala@codeaurora.org>
parent f874f199

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static int cam_cpas_util_apply_client_axi_vote( 
		if (rc) {

			CAM_ERR(CAM_CPAS,

				"Failed camnoc vote ab[%llu] ib[%llu] rc=%d",

				0, camnoc_bw, rc);

				(uint64_t)0, camnoc_bw, rc);

			goto unlock_axi_port;

		}

	}

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c

+3 −3
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static int cam_fd_packet_generic_blob_handler(void *user_data, 
		(struct cam_fd_hw_cmd_prestart_args *)user_data;



	if (!blob_data || (blob_size == 0)) {

		CAM_ERR(CAM_FD, "Invalid blob info %pK %d", blob_data,

		CAM_ERR(CAM_FD, "Invalid blob info %pK %u", blob_data,

			blob_size);

		return -EINVAL;

	}
@@ -417,7 +417,7 @@ static int cam_fd_packet_generic_blob_handler(void *user_data, 
		uint32_t *get_raw_results = (uint32_t *)blob_data;



		if (sizeof(uint32_t) != blob_size) {

			CAM_ERR(CAM_FD, "Invalid blob size %d %d",

			CAM_ERR(CAM_FD, "Invalid blob size %lu %u",

				sizeof(uint32_t), blob_size);

			return -EINVAL;

		}
@@ -430,7 +430,7 @@ static int cam_fd_packet_generic_blob_handler(void *user_data, 
			(struct cam_fd_soc_clock_bw_request *)blob_data;



		if (sizeof(struct cam_fd_soc_clock_bw_request) != blob_size) {

			CAM_ERR(CAM_FD, "Invalid blob size %d %d",

			CAM_ERR(CAM_FD, "Invalid blob size %lu %u",

				sizeof(struct cam_fd_soc_clock_bw_request),

				blob_size);

			return -EINVAL;

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.c

+7 −7
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int cam_fd_hw_util_fdwrapper_sync_reset(struct cam_hw_info *fd_hw) 
	time_left = wait_for_completion_timeout(&fd_core->reset_complete,

		msecs_to_jiffies(CAM_FD_HW_HALT_RESET_TIMEOUT));

	if (time_left <= 0)

		CAM_WARN(CAM_FD, "HW reset timeout time_left=%d", time_left);

		CAM_WARN(CAM_FD, "HW reset timeout time_left=%ld", time_left);



	CAM_DBG(CAM_FD, "FD Wrapper SW Sync Reset complete");
@@ -157,7 +157,7 @@ static int cam_fd_hw_util_fdwrapper_halt(struct cam_hw_info *fd_hw) 
	time_left = wait_for_completion_timeout(&fd_core->halt_complete,

		msecs_to_jiffies(CAM_FD_HW_HALT_RESET_TIMEOUT));

	if (time_left <= 0)

		CAM_WARN(CAM_FD, "HW halt timeout time_left=%d", time_left);

		CAM_WARN(CAM_FD, "HW halt timeout time_left=%ld", time_left);



	CAM_DBG(CAM_FD, "FD Wrapper Halt complete");
@@ -651,7 +651,7 @@ int cam_fd_hw_init(void *hw_priv, void *init_hw_args, uint32_t arg_size) 
	}



	if (arg_size != sizeof(struct cam_fd_hw_init_args)) {

		CAM_ERR(CAM_FD, "Invalid arg size %d, %d", arg_size,

		CAM_ERR(CAM_FD, "Invalid arg size %u, %lu", arg_size,

			sizeof(struct cam_fd_hw_init_args));

		return -EINVAL;

	}
@@ -735,7 +735,7 @@ int cam_fd_hw_deinit(void *hw_priv, void *deinit_hw_args, uint32_t arg_size) 
	}



	if (arg_size != sizeof(struct cam_fd_hw_deinit_args)) {

		CAM_ERR(CAM_FD, "Invalid arg size %d, %d", arg_size,

		CAM_ERR(CAM_FD, "Invalid arg size %u, %lu", arg_size,

			sizeof(struct cam_fd_hw_deinit_args));

		return -EINVAL;

	}
@@ -859,7 +859,7 @@ int cam_fd_hw_start(void *hw_priv, void *hw_start_args, uint32_t arg_size) 
	}



	if (arg_size != sizeof(struct cam_fd_hw_cmd_start_args)) {

		CAM_ERR(CAM_FD, "Invalid arg size %d, %d", arg_size,

		CAM_ERR(CAM_FD, "Invalid arg size %u, %lu", arg_size,

			sizeof(struct cam_fd_hw_cmd_start_args));

		return -EINVAL;

	}
@@ -1010,7 +1010,7 @@ int cam_fd_hw_reserve(void *hw_priv, void *hw_reserve_args, uint32_t arg_size) 
	}



	if (arg_size != sizeof(struct cam_fd_hw_reserve_args)) {

		CAM_ERR(CAM_FD, "Invalid arg size %d, %d", arg_size,

		CAM_ERR(CAM_FD, "Invalid arg size %u, %lu", arg_size,

			sizeof(struct cam_fd_hw_reserve_args));

		return -EINVAL;

	}
@@ -1079,7 +1079,7 @@ int cam_fd_hw_release(void *hw_priv, void *hw_release_args, uint32_t arg_size) 
	}



	if (arg_size != sizeof(struct cam_fd_hw_release_args)) {

		CAM_ERR(CAM_FD, "Invalid arg size %d, %d", arg_size,

		CAM_ERR(CAM_FD, "Invalid arg size %u, %lu", arg_size,

			sizeof(struct cam_fd_hw_release_args));

		return -EINVAL;

	}

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+2 −4
Original line number Diff line number Diff line
@@ -1008,8 +1008,7 @@ static int cam_ife_hw_mgr_acquire_res_ife_csid_rdi( 
		rc = cam_ife_hw_mgr_get_res(&ife_ctx->free_res_list,

			&csid_res);

		if (rc) {

			CAM_ERR(CAM_ISP, "No more free hw mgr resource",

				__func__);

			CAM_ERR(CAM_ISP, "No more free hw mgr resource");

			goto err;

		}

		cam_ife_hw_mgr_put_res(&ife_ctx->res_list_ife_csid, &csid_res);
@@ -2762,8 +2761,7 @@ static int cam_ife_hw_mgr_process_overflow( 
	CAM_DBG(CAM_ISP, "Enter");



	if (!recovery_data) {

		CAM_ERR(CAM_ISP, "recovery_data parameter is NULL",

			__func__);

		CAM_ERR(CAM_ISP, "recovery_data parameter is NULL");

		return -EINVAL;

	}

	recovery_data->no_of_context = 0;

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+2 −1
Original line number Diff line number Diff line
@@ -2778,7 +2778,8 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data) 
		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->csi2_reg->

			csid_csi2_rx_captured_short_pkt_1_addr);

		CAM_ERR(CAM_ISP, "CSID:%d short packet ECC :%d", val);

		CAM_ERR(CAM_ISP, "CSID:%d short packet ECC :%d",

			csid_hw->hw_intf->hw_idx, val);

	}



	if ((csid_hw->csid_debug & CSID_DEBUG_ENABLE_CPHY_PKT_CAPTURE) &&