From 7a71aba234b7bd5532326c0f344d786cd1b22c61 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 25 Mar 2020 10:40:29 -0700 Subject: [PATCH] gpu: nvgpu: unit: Fix header guards Fix cases where header guard #ifdef and #define had a mismatch. Change-Id: I74aec2736c467f79e9786880d3e3847ee86a2466 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2318388 Reviewed-by: automaticguardword Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- userspace/units/fifo/nvgpu-fifo-gv11b.h | 4 ++-- userspace/units/gr/nvgpu-gr-gv11b.h | 4 ++-- userspace/units/mock-iospace/include/gv11b_mock_regs.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/userspace/units/fifo/nvgpu-fifo-gv11b.h b/userspace/units/fifo/nvgpu-fifo-gv11b.h index 0974328c8..1217b9b34 100644 --- a/userspace/units/fifo/nvgpu-fifo-gv11b.h +++ b/userspace/units/fifo/nvgpu-fifo-gv11b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -21,7 +21,7 @@ */ #ifndef UNIT_NVGPU_FIFO_GV11B_H -#define UNIT_NVGPU_FIFO_GV11b_H +#define UNIT_NVGPU_FIFO_GV11B_H int test_fifo_setup_gv11b_reg_space(struct unit_module *m, struct gk20a *g); void test_fifo_cleanup_gv11b_reg_space(struct unit_module *m, struct gk20a *g); diff --git a/userspace/units/gr/nvgpu-gr-gv11b.h b/userspace/units/gr/nvgpu-gr-gv11b.h index cd43285c2..06b5e2941 100644 --- a/userspace/units/gr/nvgpu-gr-gv11b.h +++ b/userspace/units/gr/nvgpu-gr-gv11b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -21,7 +21,7 @@ */ #ifndef UNIT_NVGPU_GR_GV11B_H -#define UNIT_NVGPU_GR_GV11b_H +#define UNIT_NVGPU_GR_GV11B_H int test_gr_setup_gv11b_reg_space(struct unit_module *m, struct gk20a *g); void test_gr_cleanup_gv11b_reg_space(struct unit_module *m, struct gk20a *g); diff --git a/userspace/units/mock-iospace/include/gv11b_mock_regs.h b/userspace/units/mock-iospace/include/gv11b_mock_regs.h index 8033049e4..a2ed5cbcf 100644 --- a/userspace/units/mock-iospace/include/gv11b_mock_regs.h +++ b/userspace/units/mock-iospace/include/gv11b_mock_regs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved. * * NVIDIA Corporation and its licensors retain all intellectual property and * proprietary rights in and to this software and related documentation. Any @@ -8,7 +8,7 @@ * is strictly prohibited. */ #ifndef NVGPU_GV11B_IOSPACE_H -#define NVVGPU_GV11b_IOSPACE_H +#define NVGPU_GV11B_IOSPACE_H struct mock_iospace { const uint32_t *data;