From 8067e36749945c15b17530a94e1f46efeb9f258a Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Wed, 26 May 2021 13:43:51 +0100 Subject: [PATCH] Revert "FROMLIST: dma-buf: add support for virtio exported objects" This reverts commit 0787bdf576a8c9be24f2e1d2f460d67f50d6c45e. No AOSP user and hasn't been exported since android11-5.4. Cc: David Stevens Suggested-by: Todd Kjos Signed-off-by: Lee Jones Change-Id: I19eaa27d3c9cfdad1f8b47ff559632034c660b60 --- drivers/dma-buf/dma-buf.c | 12 ------------ include/linux/dma-buf.h | 15 --------------- 2 files changed, 27 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 7ceb278f715b..0fe218243ede 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1399,18 +1399,6 @@ int dma_buf_get_flags(struct dma_buf *dmabuf, unsigned long *flags) } EXPORT_SYMBOL_GPL(dma_buf_get_flags); -int dma_buf_get_uuid(struct dma_buf *dmabuf, uuid_t *uuid) -{ - if (WARN_ON(!dmabuf) || !uuid) - return -EINVAL; - - if (!dmabuf->ops->get_uuid) - return -ENODEV; - - return dmabuf->ops->get_uuid(dmabuf, uuid); -} -EXPORT_SYMBOL_GPL(dma_buf_get_uuid); - #ifdef CONFIG_DEBUG_FS static int dma_buf_debug_show(struct seq_file *s, void *unused) { diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 8930413d92df..9d27e3106abd 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -328,21 +328,6 @@ struct dma_buf_ops { int (*vmap)(struct dma_buf *dmabuf, struct dma_buf_map *map); void (*vunmap)(struct dma_buf *dmabuf, struct dma_buf_map *map); - /** - * @get_uuid - * - * This is called by dma_buf_get_uuid to get the UUID which identifies - * the buffer to virtio devices. - * - * This callback is optional. - * - * Returns: - * - * 0 on success or a negative error code on failure. On success uuid - * will be populated with the buffer's UUID. - */ - int (*get_uuid)(struct dma_buf *dmabuf, uuid_t *uuid); - /** * @get_flags: *