aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2016-05-31 16:59:13 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-17 21:17:40 -0700
commitb1f656044a9936880d5a7460cd8784b2e124ab87 (patch)
tree4ad4b06dabae43826a398b9b9238f2ff7a5b98cc
parent1fe82e2e148697fd1fbbb2944e143b182c51e227 (diff)
staging/android: add DEBUG_FS dependence on Kconfig
SW_SYNC only works with DEBUG_FS so state it in the Kconfig file. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/android/Kconfig1
-rw-r--r--drivers/staging/android/sync_debug.c4
-rw-r--r--drivers/staging/android/sync_debug.h4
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index f52c682..06e41d2 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -28,6 +28,7 @@ config SW_SYNC
bool "Software synchronization framework"
default n
depends on SYNC_FILE
+ depends on DEBUG_FS
---help---
A sync object driver that uses a 32bit counter to coordinate
synchronization. Useful when there is no hardware primitive backing
diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
index b760226..9032969 100644
--- a/drivers/staging/android/sync_debug.c
+++ b/drivers/staging/android/sync_debug.c
@@ -17,8 +17,6 @@
#include <linux/debugfs.h>
#include "sync_debug.h"
-#ifdef CONFIG_DEBUG_FS
-
static struct dentry *dbgfs;
static LIST_HEAD(sync_timeline_list_head);
@@ -225,5 +223,3 @@ void sync_dump(void)
}
}
}
-
-#endif
diff --git a/drivers/staging/android/sync_debug.h b/drivers/staging/android/sync_debug.h
index 48e2d1c..425ebc5 100644
--- a/drivers/staging/android/sync_debug.h
+++ b/drivers/staging/android/sync_debug.h
@@ -41,9 +41,7 @@ struct sync_timeline {
struct list_head active_list_head;
-#ifdef CONFIG_DEBUG_FS
struct list_head sync_timeline_list;
-#endif
};
static inline struct sync_timeline *fence_parent(struct fence *fence)
@@ -64,7 +62,7 @@ struct sync_pt {
struct list_head active_list;
};
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_SW_SYNC
extern const struct file_operations sw_sync_debugfs_fops;