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

Commit 1b47a3c8 authored by Kiran Kumar H N's avatar Kiran Kumar H N
Browse files

msm: camera: Remove unused code used to map userspace buffers. 



Remove MSM_CAM_IOCTL_SET_MEM_MAP_INFO IOCTL support, since the usage
of this IOCTL is now depreciated.

Change-Id: I2ca8477fc804a80587bf40dba38904347e9b25aa
Signed-off-by: default avatarKiran Kumar H N <hurlisal@codeaurora.org>
parent ad0ce55e

drivers/media/platform/msm/camera_v1/server/msm_cam_server.c

+0 −41
Original line number Diff line number Diff line
@@ -2777,40 +2777,6 @@ static unsigned int msm_poll_config(struct file *fp, 
	return rc;

}



static int msm_mmap_config(struct file *fp, struct vm_area_struct *vma)

{

	struct msm_cam_config_dev *config_cam = fp->private_data;

	int rc = 0;

	int phyaddr;

	int retval;

	unsigned long size;



	D("%s: phy_addr=0x%x", __func__, config_cam->mem_map.cookie);

	phyaddr = (int)config_cam->mem_map.cookie;

	if (!phyaddr) {

		pr_err("%s: no physical memory to map", __func__);

		return -EFAULT;

	}

	memset(&config_cam->mem_map, 0,

		sizeof(struct msm_mem_map_info));

	size = vma->vm_end - vma->vm_start;

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	retval = remap_pfn_range(vma, vma->vm_start,

					phyaddr >> PAGE_SHIFT,

					size, vma->vm_page_prot);

	if (retval) {

		pr_err("%s: remap failed, rc = %d",

					__func__, retval);

		rc = -ENOMEM;

		goto end;

	}

	D("%s: phy_addr=0x%x: %08lx-%08lx, pgoff %08lx\n",

			__func__, (uint32_t)phyaddr,

			vma->vm_start, vma->vm_end, vma->vm_pgoff);

end:

	return rc;

}



static int msm_open_config(struct inode *inode, struct file *fp)

{

	int rc;
@@ -3081,12 +3047,6 @@ static long msm_ioctl_config(struct file *fp, unsigned int cmd, 
		rc = msm_v4l2_evt_notify(config_cam->p_mctl, cmd, arg);

		break;



	case MSM_CAM_IOCTL_SET_MEM_MAP_INFO:

		if (copy_from_user(&config_cam->mem_map, (void __user *)arg,

				sizeof(struct msm_mem_map_info)))

			rc = -EINVAL;

		break;



	case MSM_CAM_IOCTL_SET_MCTL_SDEV:{

		struct msm_mctl_set_sdev_data set_data;

		if (copy_from_user(&set_data, (void __user *)arg,
@@ -3148,7 +3108,6 @@ static const struct file_operations msm_fops_config = { 
	.open  = msm_open_config,

	.poll  = msm_poll_config,

	.unlocked_ioctl = msm_ioctl_config,

	.mmap	= msm_mmap_config,

	.release = msm_close_config,

};