staging: android: ion: Remove duplicate ION_IOC_MAP
ION_IOC_MAP is the same as ION_IOC_SHARE. We really don't need two identical interfaces. Remove it. Signed-off-by: Laura Abbott <labbott@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
4c23cbff07
Коммит
db70331bc6
|
@ -144,7 +144,6 @@ long compat_ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||||
(unsigned long)data);
|
(unsigned long)data);
|
||||||
}
|
}
|
||||||
case ION_IOC_SHARE:
|
case ION_IOC_SHARE:
|
||||||
case ION_IOC_MAP:
|
|
||||||
return filp->f_op->unlocked_ioctl(filp, cmd,
|
return filp->f_op->unlocked_ioctl(filp, cmd,
|
||||||
(unsigned long)compat_ptr(arg));
|
(unsigned long)compat_ptr(arg));
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -118,7 +118,6 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ION_IOC_SHARE:
|
case ION_IOC_SHARE:
|
||||||
case ION_IOC_MAP:
|
|
||||||
{
|
{
|
||||||
struct ion_handle *handle;
|
struct ion_handle *handle;
|
||||||
|
|
||||||
|
|
|
@ -163,16 +163,6 @@ struct ion_heap_query {
|
||||||
*/
|
*/
|
||||||
#define ION_IOC_FREE _IOWR(ION_IOC_MAGIC, 1, struct ion_handle_data)
|
#define ION_IOC_FREE _IOWR(ION_IOC_MAGIC, 1, struct ion_handle_data)
|
||||||
|
|
||||||
/**
|
|
||||||
* DOC: ION_IOC_MAP - get a file descriptor to mmap
|
|
||||||
*
|
|
||||||
* Takes an ion_fd_data struct with the handle field populated with a valid
|
|
||||||
* opaque handle. Returns the struct with the fd field set to a file
|
|
||||||
* descriptor open in the current address space. This file descriptor
|
|
||||||
* can then be used as an argument to mmap.
|
|
||||||
*/
|
|
||||||
#define ION_IOC_MAP _IOWR(ION_IOC_MAGIC, 2, struct ion_fd_data)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DOC: ION_IOC_SHARE - creates a file descriptor to use to share an allocation
|
* DOC: ION_IOC_SHARE - creates a file descriptor to use to share an allocation
|
||||||
*
|
*
|
||||||
|
|
Загрузка…
Ссылка в новой задаче