2 files changed, 5 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/common/enabled.c b/drivers/gpu/nvgpu/common/enabled.c
index 00df9e3b..eaebe48c 100644
--- a/drivers/gpu/nvgpu/common/enabled.c
+++ b/drivers/gpu/nvgpu/common/enabled.c
@@ -54,11 +54,11 @@ bool nvgpu_is_enabled(struct gk20a *g, int flag)
         return test_bit(flag, g->enabled_flags);
 }
 
-bool __nvgpu_set_enabled(struct gk20a *g, int flag, bool state)
+void __nvgpu_set_enabled(struct gk20a *g, int flag, bool state)
 {
         if (state) {
-                return test_and_set_bit(flag, g->enabled_flags);
+                set_bit(flag, g->enabled_flags);
         } else {
-                return test_and_clear_bit(flag, g->enabled_flags);
+                clear_bit(flag, g->enabled_flags);
         }
 }
diff --git a/drivers/gpu/nvgpu/include/nvgpu/enabled.h b/drivers/gpu/nvgpu/include/nvgpu/enabled.h
index a0b738e0..54c4d61c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/enabled.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/enabled.h
@@ -192,10 +192,9 @@ bool nvgpu_is_enabled(struct gk20a *g, int flag);
  * @flag  - Which flag to modify.
  * @state - The state to set the flag to.
  *
- * Set the state of the passed @flag to @state. This will return the previous
- * state of the passed @flag.
+ * Set the state of the passed @flag to @state.
  */
-bool __nvgpu_set_enabled(struct gk20a *g, int flag, bool state);
+void __nvgpu_set_enabled(struct gk20a *g, int flag, bool state);
 
 int nvgpu_init_enabled_flags(struct gk20a *g);
 void nvgpu_free_enabled_flags(struct gk20a *g);