--- drivers/media/video/msm/server/msm_cam_server.c

+++ drivers/media/video/msm/server/msm_cam_server.c

@@ -2777,40 +2777,6 @@ static unsigned int msm_poll_config(stru

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;

@@ -3087,12 +3053,6 @@ static long msm_ioctl_config(struct file

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,

@@ -3176,7 +3136,6 @@ static const struct file_operations msm_

.open = msm_open_config,

.poll = msm_poll_config,

.unlocked_ioctl = msm_ioctl_config,

- .mmap = msm_mmap_config,

.release = msm_close_config,

};