From: Gustavo Padovan <gustavo@padovan.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
dri-devel@lists.freedesktop.org,
"Daniel Stone" <daniels@collabora.com>,
"Arve Hjønnevåg" <arve@android.com>,
"Riley Andrews" <riandrews@android.com>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Rob Clark" <robdclark@gmail.com>,
"Greg Hackmann" <ghackmann@google.com>,
"John Harrison" <John.C.Harrison@Intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>
Subject: [PATCH 18/18] staging/android: add DEBUG_FS dependence on Kconfig
Date: Tue, 31 May 2016 16:59:13 -0300 [thread overview]
Message-ID: <1464724753-2490-19-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1464724753-2490-1-git-send-email-gustavo@padovan.org>
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
SW_SYNC only works with DEBUG_FS so state it in the Kconfig file.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/staging/android/Kconfig | 1 +
drivers/staging/android/sync_debug.c | 4 ----
drivers/staging/android/sync_debug.h | 4 +---
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;
--
2.5.5
next prev parent reply other threads:[~2016-05-31 20:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 19:58 [PATCH 00/18] staging/android: clean up SW_SYNC Gustavo Padovan
2016-05-31 19:58 ` [PATCH 01/18] staging/android: store last signaled value on sync timeline Gustavo Padovan
2016-05-31 19:58 ` [PATCH 02/18] staging/android: remove .{fence,timeline}_value_str() from timeline_ops Gustavo Padovan
2016-05-31 19:58 ` [PATCH 03/18] staging/android: remove struct sync_timeline_ops Gustavo Padovan
2016-05-31 19:58 ` [PATCH 04/18] staging/android: remove sw_sync_timeline and sw_sync_pt Gustavo Padovan
2016-05-31 19:59 ` [PATCH 05/18] staging/android: remove sw_sync.[ch] files Gustavo Padovan
2016-05-31 19:59 ` [PATCH 06/18] staging/android: rename android_fence to timeline_fence Gustavo Padovan
2016-05-31 19:59 ` [PATCH 07/18] staging/android: remove unnecessary check for fence Gustavo Padovan
2016-05-31 19:59 ` [PATCH 08/18] staging/android: remove size arg of sync_timeline_create() Gustavo Padovan
2016-05-31 19:59 ` [PATCH 09/18] staging/android: bring struct sync_pt back Gustavo Padovan
2016-05-31 19:59 ` [PATCH 10/18] staging/android: move sw_sync related code to sw_sync.c Gustavo Padovan
2016-05-31 19:59 ` [PATCH 11/18] staging/android: clean up #includes in the sync framework Gustavo Padovan
2016-05-31 19:59 ` [PATCH 12/18] staging/android: make sync_timeline internal to sw_sync Gustavo Padovan
2016-05-31 19:59 ` [PATCH 13/18] staging/android: make sw_ioctl info internal to sw_sync.c Gustavo Padovan
2016-05-31 19:59 ` [PATCH 14/18] staging/android: remove 'destroyed' member from struct sync_timeline Gustavo Padovan
2016-05-31 19:59 ` [PATCH 15/18] staging/android: remove sync_timeline_destroy() Gustavo Padovan
2016-05-31 19:59 ` [PATCH 16/18] staging/android: remove drv_name from sync_timeline Gustavo Padovan
2016-05-31 19:59 ` [PATCH 17/18] staging/android: rename sync.h to sync_debug.h Gustavo Padovan
2016-05-31 19:59 ` Gustavo Padovan [this message]
2016-06-08 19:07 ` [PATCH 00/18] staging/android: clean up SW_SYNC Gustavo Padovan
2016-06-09 5:45 ` Greg Kroah-Hartman
2016-06-09 8:23 ` Daniel Vetter
2016-06-09 13:56 ` Sumit Semwal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464724753-2490-19-git-send-email-gustavo@padovan.org \
--to=gustavo@padovan.org \
--cc=John.C.Harrison@Intel.com \
--cc=arve@android.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniels@collabora.com \
--cc=devel@driverdev.osuosl.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=ghackmann@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavo.padovan@collabora.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=riandrews@android.com \
--cc=robdclark@gmail.com \
--cc=sumit.semwal@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®