Merge "msm: camera: Remove unused code used to map userspace buffers." (5ea68183) · Commits · e / devices / android_kernel_sony_msm8994

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

+0 −41

Original line number	Original line	Diff line number	Diff line
	@@ -2777,40 +2777,6 @@ static unsigned int msm_poll_config(struct file *fp,
	return rc;		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)		static int msm_open_config(struct inode inode, struct file fp)
	{		{
	int rc;		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);		rc = msm_v4l2_evt_notify(config_cam->p_mctl, cmd, arg);
	break;		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:{		case MSM_CAM_IOCTL_SET_MCTL_SDEV:{
	struct msm_mctl_set_sdev_data set_data;		struct msm_mctl_set_sdev_data set_data;
	if (copy_from_user(&set_data, (void __user *)arg,		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,		.open = msm_open_config,
	.poll = msm_poll_config,		.poll = msm_poll_config,
	.unlocked_ioctl = msm_ioctl_config,		.unlocked_ioctl = msm_ioctl_config,
	.mmap = msm_mmap_config,
	.release = msm_close_config,		.release = msm_close_config,
	};		};