From 62df34992b2abca7aefb5b01d005d38b72fd23b9 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Thu, 10 Jun 2021 18:36:21 +0800 Subject: [PATCH] Revert "UPSTREAM: dma-buf: Fix SET_NAME ioctl uapi" This reverts commit 97fd8955415750cf47f4b2b799fd0527c848d2d0. Relpaced by commit 06931a5d14e2 ("UPSTREAM: dma-buf: Fix SET_NAME ioctl uapi"). Signed-off-by: Tao Huang Change-Id: I8623aa664bca0c41967a14b7f2247927c0b26151 --- drivers/dma-buf/dma-buf.c | 3 +-- include/uapi/linux/dma-buf.h | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index bf92ce7e4e3e..6bfe7cbd07c9 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -442,8 +442,7 @@ static long dma_buf_ioctl(struct file *file, return ret; - case DMA_BUF_SET_NAME_A: - case DMA_BUF_SET_NAME_B: + case DMA_BUF_SET_NAME: return dma_buf_set_name(dmabuf, (const char __user *)arg); case DMA_BUF_IOCTL_SYNC_PARTIAL: diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index fa847a9f4641..8bba913a8a30 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -41,13 +41,7 @@ struct dma_buf_sync { #define DMA_BUF_BASE 'b' #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) - -/* 32/64bitness of this uapi was botched in android, there's no difference - * between them in actual uapi, they're just different numbers. - */ #define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *) -#define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, u32) -#define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, u64) struct dma_buf_sync_partial { __u64 flags;