[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20210629081124.3585539-1-tientzu@chromium.org>
Date: Tue, 29 Jun 2021 16:11:24 +0800
From: Claire Chang <tientzu@...omium.org>
To: konrad.wilk@...cle.com, hch@....de, m.szyprowski@...sung.com,
robin.murphy@....com
Cc: iommu@...ts.linux-foundation.org, linux-kernel@...r.kernel.org,
Claire Chang <tientzu@...omium.org>,
kernel test robot <lkp@...el.com>
Subject: [PATCH] swiotlb: fix implicit debugfs_create_dir declaration
Use __maybe_unused instead of ifdef to fix implicit function declaration
for other pools.
Fixes: 1d9f94400a7a ("swiotlb: Refactor swiotlb_create_debugfs")
Reported-by: kernel test robot <lkp@...el.com>
Signed-off-by: Claire Chang <tientzu@...omium.org>
---
kernel/dma/swiotlb.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 0ffbaae9fba2..508b678f6448 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -36,9 +36,7 @@
#include <linux/scatterlist.h>
#include <linux/mem_encrypt.h>
#include <linux/set_memory.h>
-#ifdef CONFIG_DEBUG_FS
#include <linux/debugfs.h>
-#endif
#ifdef CONFIG_DMA_RESTRICTED_POOL
#include <linux/io.h>
#include <linux/of.h>
@@ -686,10 +684,9 @@ bool is_swiotlb_active(struct device *dev)
}
EXPORT_SYMBOL_GPL(is_swiotlb_active);
-#ifdef CONFIG_DEBUG_FS
-static struct dentry *debugfs_dir;
+__maybe_unused static struct dentry *debugfs_dir;
-static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem)
+__maybe_unused static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem)
{
debugfs_create_ulong("io_tlb_nslabs", 0400, mem->debugfs, &mem->nslabs);
debugfs_create_ulong("io_tlb_used", 0400, mem->debugfs, &mem->used);
@@ -709,8 +706,6 @@ static int __init swiotlb_create_default_debugfs(void)
late_initcall(swiotlb_create_default_debugfs);
-#endif
-
#ifdef CONFIG_DMA_RESTRICTED_POOL
struct page *swiotlb_alloc(struct device *dev, size_t size)
{
--
2.32.0.93.g670b81a890-goog
Powered by blists - more mailing lists