summaryrefslogtreecommitdiff
path: root/drivers/dma-buf
diff options
context:
space:
mode:
authorT.J. Mercier <tjmercier@google.com>2024-11-17 17:03:25 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-12-27 14:02:10 +0100
commitc8395bfcd0e3b3d7c8576dca33ec8f64bf9c3c17 (patch)
tree02fb7bc2a0f88f265f6516d3951248ca9dedff94 /drivers/dma-buf
parentc9fc8428d4255c2128da9c4d5cd92e554d0150cf (diff)
downloadlinux-c8395bfcd0e3b3d7c8576dca33ec8f64bf9c3c17.tar.gz
linux-c8395bfcd0e3b3d7c8576dca33ec8f64bf9c3c17.tar.bz2
linux-c8395bfcd0e3b3d7c8576dca33ec8f64bf9c3c17.zip
dma-buf: Fix __dma_buf_debugfs_list_del argument for !CONFIG_DEBUG_FS
[ Upstream commit 0cff90dec63da908fb16d9ea2872ebbcd2d18e6a ] The arguments for __dma_buf_debugfs_list_del do not match for both the CONFIG_DEBUG_FS case and the !CONFIG_DEBUG_FS case. The !CONFIG_DEBUG_FS case should take a struct dma_buf *, but it's currently struct file *. This can lead to the build error: error: passing argument 1 of ‘__dma_buf_debugfs_list_del’ from incompatible pointer type [-Werror=incompatible-pointer-types] dma-buf.c:63:53: note: expected ‘struct file *’ but argument is of type ‘struct dma_buf *’ 63 | static void __dma_buf_debugfs_list_del(struct file *file) Fixes: bfc7bc539392 ("dma-buf: Do not build debugfs related code when !CONFIG_DEBUG_FS") Signed-off-by: T.J. Mercier <tjmercier@google.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20241117170326.1971113-1-tjmercier@google.com Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/dma-buf')
-rw-r--r--drivers/dma-buf/dma-buf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 8892bc701a66..afb8c1c50107 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -60,7 +60,7 @@ static void __dma_buf_debugfs_list_add(struct dma_buf *dmabuf)
{
}
-static void __dma_buf_debugfs_list_del(struct file *file)
+static void __dma_buf_debugfs_list_del(struct dma_buf *dmabuf)
{
}
#endif