diff --git a/drivers/firmware/tegra/Makefile b/drivers/firmware/tegra/Makefile
index d67b38e1..5bbfae69 100644
--- a/drivers/firmware/tegra/Makefile
+++ b/drivers/firmware/tegra/Makefile
@@ -14,7 +14,7 @@ obj-m		+= ivc_ext.o
 tegra_bpmp-y	+= ../../clk/tegra/clk-bpmp.o
 tegra_bpmp-y	+= ../../reset/tegra/reset-bpmp.o
 tegra_bpmp-y	+= ../../soc/tegra/powergate-bpmp.o
-tegra_bpmp-y	+= bpmp-debugfs.o
+tegra_bpmp-$(CONFIG_DEBUG_FS)	+= bpmp-debugfs.o
 tegra_bpmp-y	+= bpmp-tegra186-hv.o
 obj-m 		+= tegra_bpmp.o
 endif
diff --git a/drivers/scsi/ufs/ufs-provision.h b/drivers/scsi/ufs/ufs-provision.h
index ef743203..5ac6d9da 100644
--- a/drivers/scsi/ufs/ufs-provision.h
+++ b/drivers/scsi/ufs/ufs-provision.h
@@ -17,6 +17,15 @@
 #include <linux/debugfs.h>
 void debugfs_provision_init(struct ufs_hba *hba, struct dentry *device_root);
 void debugfs_provision_exit(struct ufs_hba *hba);
+#else
+static inline void debugfs_provision_init(struct ufs_hba *hba, struct dentry *device_root)
+{
+	return;
+}
+static inline void debugfs_provision_exit(struct ufs_hba *hba)
+{
+	return;
+}
 #endif
 
 #endif
diff --git a/drivers/scsi/ufs/ufs-tegra-common.c b/drivers/scsi/ufs/ufs-tegra-common.c
index fe68da2c..99ca1901 100644
--- a/drivers/scsi/ufs/ufs-tegra-common.c
+++ b/drivers/scsi/ufs/ufs-tegra-common.c
@@ -19,9 +19,7 @@
 #include <linux/iommu.h>
 #include <linux/pinctrl/consumer.h>
 
-#ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
-#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
 #include <drivers-private/scsi/ufs/k515/ufshcd-pltfrm.h>