dma-buf: heaps: Use _IOCTL_ for userspace IOCTL identifier
This is more consistent with the DMA and DRM frameworks convention. This patch is only a name change, no logic is changed. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20191216133405.1001-2-afd@ti.com
This commit is contained in:
Родитель
fb6c7ab871
Коммит
b3b4346544
|
@ -107,7 +107,7 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int dma_heap_ioctl_cmds[] = {
|
unsigned int dma_heap_ioctl_cmds[] = {
|
||||||
DMA_HEAP_IOC_ALLOC,
|
DMA_HEAP_IOCTL_ALLOC,
|
||||||
};
|
};
|
||||||
|
|
||||||
static long dma_heap_ioctl(struct file *file, unsigned int ucmd,
|
static long dma_heap_ioctl(struct file *file, unsigned int ucmd,
|
||||||
|
@ -153,7 +153,7 @@ static long dma_heap_ioctl(struct file *file, unsigned int ucmd,
|
||||||
memset(kdata + in_size, 0, ksize - in_size);
|
memset(kdata + in_size, 0, ksize - in_size);
|
||||||
|
|
||||||
switch (kcmd) {
|
switch (kcmd) {
|
||||||
case DMA_HEAP_IOC_ALLOC:
|
case DMA_HEAP_IOCTL_ALLOC:
|
||||||
ret = dma_heap_ioctl_allocate(file, kdata);
|
ret = dma_heap_ioctl_allocate(file, kdata);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -42,12 +42,12 @@ struct dma_heap_allocation_data {
|
||||||
#define DMA_HEAP_IOC_MAGIC 'H'
|
#define DMA_HEAP_IOC_MAGIC 'H'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DOC: DMA_HEAP_IOC_ALLOC - allocate memory from pool
|
* DOC: DMA_HEAP_IOCTL_ALLOC - allocate memory from pool
|
||||||
*
|
*
|
||||||
* Takes a dma_heap_allocation_data struct and returns it with the fd field
|
* Takes a dma_heap_allocation_data struct and returns it with the fd field
|
||||||
* populated with the dmabuf handle of the allocation.
|
* populated with the dmabuf handle of the allocation.
|
||||||
*/
|
*/
|
||||||
#define DMA_HEAP_IOC_ALLOC _IOWR(DMA_HEAP_IOC_MAGIC, 0x0,\
|
#define DMA_HEAP_IOCTL_ALLOC _IOWR(DMA_HEAP_IOC_MAGIC, 0x0,\
|
||||||
struct dma_heap_allocation_data)
|
struct dma_heap_allocation_data)
|
||||||
|
|
||||||
#endif /* _UAPI_LINUX_DMABUF_POOL_H */
|
#endif /* _UAPI_LINUX_DMABUF_POOL_H */
|
||||||
|
|
|
@ -116,7 +116,7 @@ static int dmabuf_heap_alloc_fdflags(int fd, size_t len, unsigned int fd_flags,
|
||||||
if (!dmabuf_fd)
|
if (!dmabuf_fd)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
ret = ioctl(fd, DMA_HEAP_IOC_ALLOC, &data);
|
ret = ioctl(fd, DMA_HEAP_IOCTL_ALLOC, &data);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
*dmabuf_fd = (int)data.fd;
|
*dmabuf_fd = (int)data.fd;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче