projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mmc-v4.4-rc1' of git://git.linaro.org/people/ulf.hansson/mmc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
host1x
/
debug.c
diff --git
a/drivers/gpu/host1x/debug.c
b/drivers/gpu/host1x/debug.c
index 3ec7d77de24ddc846321f159229e3d592bf02a38..ee3d12b51c50a036b89c48c3e60576a2a14acf5b 100644
(file)
--- a/
drivers/gpu/host1x/debug.c
+++ b/
drivers/gpu/host1x/debug.c
@@
-96,7
+96,6
@@
static void show_all(struct host1x *m, struct output *o)
show_channels(ch, o, true);
}
show_channels(ch, o, true);
}
-#ifdef CONFIG_DEBUG_FS
static void show_all_no_fifo(struct host1x *host1x, struct output *o)
{
struct host1x_channel *ch;
static void show_all_no_fifo(struct host1x *host1x, struct output *o)
{
struct host1x_channel *ch;
@@
-153,7
+152,7
@@
static const struct file_operations host1x_debug_fops = {
.release = single_release,
};
.release = single_release,
};
-
void host1x_debug
_init(struct host1x *host1x)
+
static void host1x_debugfs
_init(struct host1x *host1x)
{
struct dentry *de = debugfs_create_dir("tegra-host1x", NULL);
{
struct dentry *de = debugfs_create_dir("tegra-host1x", NULL);
@@
-180,18
+179,22
@@
void host1x_debug_init(struct host1x *host1x)
&host1x_debug_force_timeout_channel);
}
&host1x_debug_force_timeout_channel);
}
-
void host1x_debug_dein
it(struct host1x *host1x)
+
static void host1x_debugfs_ex
it(struct host1x *host1x)
{
debugfs_remove_recursive(host1x->debugfs);
}
{
debugfs_remove_recursive(host1x->debugfs);
}
-#else
+
void host1x_debug_init(struct host1x *host1x)
{
void host1x_debug_init(struct host1x *host1x)
{
+ if (IS_ENABLED(CONFIG_DEBUG_FS))
+ host1x_debugfs_init(host1x);
}
}
+
void host1x_debug_deinit(struct host1x *host1x)
{
void host1x_debug_deinit(struct host1x *host1x)
{
+ if (IS_ENABLED(CONFIG_DEBUG_FS))
+ host1x_debugfs_exit(host1x);
}
}
-#endif
void host1x_debug_dump(struct host1x *host1x)
{
void host1x_debug_dump(struct host1x *host1x)
{