summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2016-05-02 20:03:43 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-06-13 13:27:31 -0400
commit5cf1fddbab5a38028acd62b08198c3b9fe6465f7 (patch)
treef63b27c029a2d36451f0ae9fcd512f63d3fbd5a7 /drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
parenta295d90cac87949256b629e29f97fa5e28a1feb3 (diff)
gpu: nvgpu: Balance curly braces
In some of the conditionally compiled code in the nvgpu driver there are places where the code looks like: #ifdef LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) some-loop { #else a-diff-loop { #endif /* Some code... */ } This leaves unbalanced curley braces: two open braces for one close brace. This messes up some editors syntax highlighting and auto- indentation features. This patch puts in the extra brace. It's not necessary for compiling code but it makes some editors much happier. Change-Id: Ida28bc001cc840fe52a43982db934d49c07cc7d3 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1153668 Reviewed-by: Konsta Holtta <kholtta@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 10f1213b..d2d8c094 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -122,7 +122,11 @@ static int gk20a_channel_syncpt_wait_fd(struct gk20a_channel_sync *s, int fd,
122 sync_fence_put(sync_fence); 122 sync_fence_put(sync_fence);
123 return -EINVAL; 123 return -EINVAL;
124 } 124 }
125#if !(LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0))
125 } 126 }
127#else
128 }
129#endif
126 130
127 num_wait_cmds = nvhost_sync_num_pts(sync_fence); 131 num_wait_cmds = nvhost_sync_num_pts(sync_fence);
128 if (num_wait_cmds == 0) { 132 if (num_wait_cmds == 0) {
@@ -160,8 +164,11 @@ static int gk20a_channel_syncpt_wait_fd(struct gk20a_channel_sync *s, int fd,
160 wait_value); 164 wait_value);
161#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) 165#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
162 i++; 166 i++;
163#endif
164 } 167 }
168#else
169 }
170#endif
171
165 WARN_ON(i != num_wait_cmds); 172 WARN_ON(i != num_wait_cmds);
166 sync_fence_put(sync_fence); 173 sync_fence_put(sync_fence);
167 174