github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

rk: ion: modify the ION_IOC_XXX name easy to understand

Browse Source
This commit is contained in:
CMY 2014-02-25 17:23:06 +08:00
parent 5a940870c8
commit 6181384db8
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/android/ion/rockchip/rockchip_ion.c
View File

@ -195,43 +195,43 @@ static long rockchip_custom_ioctl (struct ion_client *client, unsigned int cmd,
return -EFAULT;
break;
}
case ION_IOC_GET_SHARE:
case ION_IOC_GET_SHARE_ID:
{
struct ion_share_obj_data data;
struct ion_share_id_data data;
struct dma_buf *dmabuf = NULL;
if (copy_from_user(&data, (void __user *)arg,
sizeof(struct ion_share_obj_data)))
sizeof(struct ion_share_id_data)))
return -EFAULT;
dmabuf = dma_buf_get(data.fd);
if (IS_ERR(dmabuf))
return PTR_ERR(dmabuf);
data.obj = (void*)dmabuf;
data.id = (unsigned int)dmabuf;
dma_buf_put(dmabuf);
if (copy_to_user((void __user *)arg, &data, sizeof(struct ion_share_obj_data)))
if (copy_to_user((void __user *)arg, &data, sizeof(struct ion_share_id_data)))
return -EFAULT;
break;
}
case ION_IOC_SET_SHARE:
case ION_IOC_SHARE_BY_ID:
{
struct ion_share_obj_data data;
struct ion_share_id_data data;
int fd = 0;
if (copy_from_user(&data, (void __user *)arg,
sizeof(struct ion_share_obj_data)))
sizeof(struct ion_share_id_data)))
return -EFAULT;
fd = dma_buf_fd((struct dma_buf*)data.obj, O_CLOEXEC);
fd = dma_buf_fd((struct dma_buf*)data.id, O_CLOEXEC);
if (fd < 0)
return fd;
data.fd = fd;
if (copy_to_user((void __user *)arg, &data, sizeof(struct ion_share_obj_data)))
if (copy_to_user((void __user *)arg, &data, sizeof(struct ion_share_id_data)))
return -EFAULT;
break;

12
include/linux/rockchip_ion.h
View File

@ -70,9 +70,9 @@ struct ion_phys_data {
unsigned long size;
};
struct ion_share_obj_data {
struct ion_share_id_data {
int fd;
void *obj;
unsigned int id;
};
#define ION_IOC_ROCKCHIP_MAGIC 'R'
@ -102,13 +102,13 @@ struct ion_share_obj_data {
/**
* Get share object of the fd specified.
*/
#define ION_IOC_GET_SHARE _IOWR(ION_IOC_ROCKCHIP_MAGIC, 4, \
struct ion_share_obj_data)
#define ION_IOC_GET_SHARE_ID _IOWR(ION_IOC_ROCKCHIP_MAGIC, 4, \
struct ion_share_id_data)
/**
* Set share object and associate new fd.
*/
#define ION_IOC_SET_SHARE _IOWR(ION_IOC_ROCKCHIP_MAGIC, 5, \
struct ion_share_obj_data)
#define ION_IOC_SHARE_BY_ID _IOWR(ION_IOC_ROCKCHIP_MAGIC, 5, \
struct ion_share_id_data)
#endif