Merge "msm: camera: Fix compile errors for 64bit" (29ef159c) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/camera/camera.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -477,7 +477,7 @@ static int camera_v4l2_fh_open(struct file *filep)
		/* stream_id = open id */
		stream_id = atomic_read(&pvdev->opened);
		sp->stream_id = find_first_zero_bit(
		&stream_id, MSM_CAMERA_STREAM_CNT_BITS);
		(const unsigned long *)&stream_id, MSM_CAMERA_STREAM_CNT_BITS);
		pr_debug("%s: Found stream_id=%d\n", __func__, sp->stream_id);

		v4l2_fh_init(&sp->fh, pvdev->vdev);
		@@ -571,7 +571,7 @@ static int camera_v4l2_open(struct file *filep)
		}

		rc = msm_create_command_ack_q(pvdev->vdev->num,
		find_first_zero_bit(&opn_idx,
		find_first_zero_bit((const unsigned long *)&opn_idx,
		MSM_CAMERA_STREAM_CNT_BITS));
		if (rc < 0) {
		pr_err("%s : creation of command_ack queue failed\n",
		@@ -597,7 +597,7 @@ static int camera_v4l2_open(struct file *filep)
		}
		} else {
		rc = msm_create_command_ack_q(pvdev->vdev->num,
		find_first_zero_bit(&opn_idx,
		find_first_zero_bit((const unsigned long *)&opn_idx,
		MSM_CAMERA_STREAM_CNT_BITS));
		if (rc < 0) {
		pr_err("%s : creation of command_ack queue failed Line %d rc %d\n",
		@@ -605,9 +605,8 @@ static int camera_v4l2_open(struct file *filep)
		goto session_fail;
		}
		}
		pr_debug("%s: Open stream_id=%d\n", __func__,
		find_first_zero_bit(&opn_idx, MSM_CAMERA_STREAM_CNT_BITS));
		idx \|= (1 << find_first_zero_bit(&opn_idx, MSM_CAMERA_STREAM_CNT_BITS));
		idx \|= (1 << find_first_zero_bit((const unsigned long *)&opn_idx,
		MSM_CAMERA_STREAM_CNT_BITS));
		atomic_cmpxchg(&pvdev->opened, opn_idx, idx);
		return rc;

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ static long msm_isp_subdev_fops_ioctl(struct file *file, unsigned int cmd,

		static struct v4l2_file_operations msm_isp_v4l2_subdev_fops = {
		#ifdef CONFIG_COMPAT
		.compat_ioctl = msm_isp_subdev_fops_ioctl,
		.compat_ioctl32 = msm_isp_subdev_fops_ioctl,
		#endif
		.unlocked_ioctl = msm_isp_subdev_fops_ioctl
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -1016,7 +1016,7 @@ void msm_camera_io_dump_2(void __iomem *addr, int size)
		p_str = line_str;
		for (i = 0; i < size/4; i++) {
		if (i % 4 == 0) {
		snprintf(p_str, 12, "%08x: ", (u32) p);
		snprintf(p_str, 12, "%p: ", p);
		p_str += 10;
		}
		data = readl_relaxed(p++);

+1 −1

Original line number	Diff line number	Diff line
		@@ -358,7 +358,7 @@ static int msm_isp_get_max_clk_rate(struct vfe_device vfe_dev, long rate)

		clk_idx = vfe_dev->hw_info->vfe_clk_idx;
		if (clk_idx >= ARRAY_SIZE(vfe_dev->vfe_clk)) {
		pr_err("%s:%d failed: clk_idx %d max array size %d\n",
		pr_err("%s:%d failed: clk_idx %d max array size %zu\n",
		__func__, __LINE__, clk_idx,
		ARRAY_SIZE(vfe_dev->vfe_clk));
		return -EINVAL;

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,8 +109,8 @@ static void msm_buf_mngr_sd_shutdown(struct msm_buf_mngr_device *buf_mngr_dev)
		if (!list_empty(&buf_mngr_dev->buf_qhead)) {
		list_for_each_entry_safe(bufs,
		save, &buf_mngr_dev->buf_qhead, entry) {
		pr_err("%s: Error delete invalid bufs =%x, ses_id=%d, str_id=%d, idx=%d\n",
		__func__, (unsigned int)bufs, bufs->session_id,
		pr_err("%s: Error delete invalid bufs =%lx, ses_id=%d, str_id=%d, idx=%d\n",
		__func__, (unsigned long)bufs, bufs->session_id,
		bufs->stream_id, bufs->vb2_buf->v4l2_buf.index);
		list_del_init(&bufs->entry);
		kfree(bufs);