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

Commit 571833d0 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Fix compiler warnings"

parents 43e17642 f86e9b66

drivers/media/platform/msm/camera/cam_core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ ccflags-y += -Idrivers/media/platform/msm/camera/cam_req_mgr 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_smmu/

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sync

ccflags-y += -Idrivers/media/platform/msm/camera/cam_utils

ccflags-y += -I$(src)



obj-$(CONFIG_SPECTRA_CAMERA) += cam_context.o cam_context_utils.o cam_node.o cam_subdev.o

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

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ static int cam_fd_mgr_util_prepare_io_buf_info(int32_t iommu_hdl, 
				if (cam_mem_put_cpu_buf(

					io_cfg[i].mem_handle[j]))

					CAM_WARN(CAM_FD,

						"Invalid cpu buf %d %d %d %d",

						"Invalid cpu buf %d %d %d",

						io_cfg[i].direction,

						io_cfg[i].resource_type, j);

			}

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+6 −4
Original line number Diff line number Diff line
@@ -3354,8 +3354,9 @@ static int cam_icp_mgr_process_cmd_desc(struct cam_icp_hw_mgr *hw_mgr, 
			if (rc) {

				CAM_ERR(CAM_ICP, "get cmd buf failed %x",

					hw_mgr->iommu_hdl);

				num_cmd_buf = (num_cmd_buf > 0) ?

					num_cmd_buf-- : 0;



				if (num_cmd_buf > 0)

					num_cmd_buf--;

				goto rel_cmd_buf;

			}

			*fw_cmd_buf_iova_addr = addr;
@@ -3367,8 +3368,9 @@ static int cam_icp_mgr_process_cmd_desc(struct cam_icp_hw_mgr *hw_mgr, 
				CAM_ERR(CAM_ICP, "get cmd buf failed %x",

					hw_mgr->iommu_hdl);

				*fw_cmd_buf_iova_addr = 0;

				num_cmd_buf = (num_cmd_buf > 0) ?

					num_cmd_buf-- : 0;



				if (num_cmd_buf > 0)

					num_cmd_buf--;

				goto rel_cmd_buf;

			}

			cpu_addr = cpu_addr + cmd_desc[i].offset;

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+2 −2
Original line number Diff line number Diff line
@@ -2708,7 +2708,7 @@ static int __cam_isp_ctx_config_dev_in_top_state( 
		goto put_ref;



	if (cam_mem_put_cpu_buf((int32_t) cmd->packet_handle))

		CAM_WARN(CAM_ISP, "Can not put packet address : 0x%x",

		CAM_WARN(CAM_ISP, "Can not put packet address : 0x%llx",

			cmd->packet_handle);



	CAM_DBG(CAM_REQ,
@@ -2725,7 +2725,7 @@ static int __cam_isp_ctx_config_dev_in_top_state( 
	}

free_cpu_buf:

	if (cam_mem_put_cpu_buf((int32_t) cmd->packet_handle))

		CAM_WARN(CAM_ISP, "Can not put packet address: 0x%x",

		CAM_WARN(CAM_ISP, "Can not put packet address: 0x%llx",

			cmd->packet_handle);

free_req:

	spin_lock_bh(&ctx->lock);

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/hw_utils/irq 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/include

ccflags-y += -Idrivers/media/platform/msm/camera/cam_smmu/

ccflags-y += -Idrivers/media/platform/msm/camera/cam_cpas/include

ccflags-y += -I$(src)



obj-$(CONFIG_SPECTRA_CAMERA) += hw_utils/ isp_hw/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_isp_hw_mgr.o cam_ife_hw_mgr.o