summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-04-21 15:42:57 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-24 14:05:17 -0400
commitb3e1ce04b963e91b9b425b3c35cc4eff11db7543 (patch)
tree73c45d0acfe3ce25298ba1dc8dfa4777e02c861a /drivers/gpu/nvgpu/include
parentb88c9ad793cb9822f359b8c498afe872c412959c (diff)
gpu: nvgpu: Put debugfs dependencies inside #ifdef
Put all debugfs dependencies inside #ifdef CONFIG_DEBUG_FS. This includes some functions in allocators that were used only for debugging. Remove include of linux/debugfs.h on files that do not deal with debugfs. linux/debugfs.h implicitly included linux/fs.h, which we relied on. Add explicit include of linux/fs.h for all files where this is the case. Change-Id: I16feffae6b0e3a2edf366075cdc01ade86be06f9 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1467897 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/allocator.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/allocator.h b/drivers/gpu/nvgpu/include/nvgpu/allocator.h
index 61914d8c..b605b059 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/allocator.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/allocator.h
@@ -17,7 +17,6 @@
17#ifndef NVGPU_ALLOCATOR_H 17#ifndef NVGPU_ALLOCATOR_H
18#define NVGPU_ALLOCATOR_H 18#define NVGPU_ALLOCATOR_H
19 19
20#include <linux/debugfs.h>
21#include <linux/seq_file.h> 20#include <linux/seq_file.h>
22#include <linux/platform_device.h> 21#include <linux/platform_device.h>
23 22
@@ -74,9 +73,11 @@ struct nvgpu_allocator_ops {
74 /* Destructor. */ 73 /* Destructor. */
75 void (*fini)(struct nvgpu_allocator *allocator); 74 void (*fini)(struct nvgpu_allocator *allocator);
76 75
76#ifdef CONFIG_DEBUG_FS
77 /* Debugging. */ 77 /* Debugging. */
78 void (*print_stats)(struct nvgpu_allocator *allocator, 78 void (*print_stats)(struct nvgpu_allocator *allocator,
79 struct seq_file *s, int lock); 79 struct seq_file *s, int lock);
80#endif
80}; 81};
81 82
82struct nvgpu_allocator { 83struct nvgpu_allocator {
@@ -246,8 +247,10 @@ u64 nvgpu_alloc_space(struct nvgpu_allocator *a);
246 247
247void nvgpu_alloc_destroy(struct nvgpu_allocator *allocator); 248void nvgpu_alloc_destroy(struct nvgpu_allocator *allocator);
248 249
250#ifdef CONFIG_DEBUG_FS
249void nvgpu_alloc_print_stats(struct nvgpu_allocator *a, 251void nvgpu_alloc_print_stats(struct nvgpu_allocator *a,
250 struct seq_file *s, int lock); 252 struct seq_file *s, int lock);
253#endif
251 254
252static inline struct gk20a *nvgpu_alloc_to_gpu(struct nvgpu_allocator *a) 255static inline struct gk20a *nvgpu_alloc_to_gpu(struct nvgpu_allocator *a)
253{ 256{