There are no drivers in the kernel that implement the uio_info mmap method so there is no point in keeping it.
Further keeping the mmap method would necessitate wrapping all of the methods in vm_operations_struct to successfully implement support for hotunplugable hardware, and it I have yet to find a correct way to wrap the the vm_operations_struct close method. Tested-by: Mandeep Sandhu <[email protected]> Signed-off-by: Mandeep Sandhu <[email protected]> --- drivers/uio/uio.c | 6 ------ include/linux/uio_driver.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index 708b093..91b9332 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -670,7 +670,6 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma) struct uio_device *idev = listener->dev; int mi; unsigned long requested_pages, actual_pages; - int ret = 0; if (vma->vm_end < vma->vm_start) return -EINVAL; @@ -687,11 +686,6 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma) if (requested_pages > actual_pages) return -EINVAL; - if (idev->info->mmap) { - ret = idev->info->mmap(idev->info, vma); - return ret; - } - switch (idev->info->mem[mi].memtype) { case UIO_MEM_PHYS: return uio_mmap_physical(vma); diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h index 3ed7fca..839c4c2 100644 --- a/include/linux/uio_driver.h +++ b/include/linux/uio_driver.h @@ -87,7 +87,6 @@ struct uio_device { * @irq_flags: flags for request_irq() * @priv: optional private data * @handler: the device's irq handler - * @mmap: mmap operation for this uio device * @open: open operation for this uio device * @release: release operation for this uio device * @irqcontrol: disable/enable irqs when 0/1 is written to /dev/uioX @@ -102,7 +101,6 @@ struct uio_info { unsigned long irq_flags; void *priv; irqreturn_t (*handler)(int irq, struct uio_info *dev_info); - int (*mmap)(struct uio_info *info, struct vm_area_struct *vma); int (*open)(struct uio_info *info, struct inode *inode); int (*release)(struct uio_info *info, struct inode *inode); int (*irqcontrol)(struct uio_info *info, s32 irq_on); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
