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

Commit 1888928a authored by Jordan Crouse's avatar Jordan Crouse
Browse files

msm: camera: Fix compile warnings 



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

 drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c:1314:
   format '%lld' expects argument of type 'long long int', but argument 6
	has type 'uint32_t {aka unsigned int}' [-Werror=format=]
   CAM_WARN(CAM_FLASH,

 drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c:1422:
   format '%p' expects argument of type 'void *', but argument 5 has type
	'int32_t {aka int}' [-Werror=format=]
    CAM_WARN(CAM_FLASH, "Fail in put buffer: %pK",

 drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c:1721:
   format '%x' expects argument of type 'unsigned int', but argument 5 has
	type 'uint64_t {aka long long unsigned int}' [-Werror=format=]
   CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%x ",

 drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c:1732:
   format '%x' expects argument of type 'unsigned int', but argument 5 has
	type 'uint64_t {aka long long unsigned int}' [-Werror=format=]
   CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%x ",

Fixes: dde94d7b ("msm: camera: Bring over remaining camera driver changes")
Change-Id: Ic0dedbad4c1d68af2a66755c79fdfefbac224c13
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent a3e72219

drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c

+4 −4
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
		csl_packet->header.request_id <= fctrl->last_flush_req

		&& fctrl->last_flush_req != 0) {

		CAM_WARN(CAM_FLASH,

			"reject request %lld, last request to flush %lld",

			"reject request %lld, last request to flush %d",

			csl_packet->header.request_id, fctrl->last_flush_req);

		rc = -EINVAL;

		goto rel_pkt_buf;
@@ -1420,7 +1420,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 


		if (cam_mem_put_cpu_buf(cmd_desc->mem_handle))

			CAM_WARN(CAM_FLASH, "Fail in put buffer: %pK",

				cmd_desc->mem_handle);

				(void *) (unsigned long) cmd_desc->mem_handle);

		break;

	}

	case CAM_FLASH_PACKET_OPCODE_SET_OPS: {
@@ -1718,7 +1718,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
	}



	if (cam_mem_put_cpu_buf(config.packet_handle))

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%x ",

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%llx ",

			config.packet_handle);



	return 0;
@@ -1729,7 +1729,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
			cmd_desc->mem_handle);

rel_pkt_buf:

	if (cam_mem_put_cpu_buf(config.packet_handle))

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%x ",

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%llx ",

			config.packet_handle);



	return rc;