diff --git a/src/drivers/pwm_out/CMakeLists.txt b/src/drivers/pwm_out/CMakeLists.txt
index d04d39ef74..017865fdb4 100644
--- a/src/drivers/pwm_out/CMakeLists.txt
+++ b/src/drivers/pwm_out/CMakeLists.txt
@@ -34,8 +34,6 @@ px4_add_module(
 	MODULE drivers__pwm_out
 	MAIN pwm_out
 	COMPILE_FLAGS
-		-Wno-unused-but-set-variable # TODO
-		-Wno-unused-variable # TODO
 	SRCS
 		PWMOut.cpp
 		PWMOut.hpp
diff --git a/src/drivers/pwm_out/PWMOut.cpp b/src/drivers/pwm_out/PWMOut.cpp
index b92381c3d3..07ec2a44e1 100644
--- a/src/drivers/pwm_out/PWMOut.cpp
+++ b/src/drivers/pwm_out/PWMOut.cpp
@@ -1743,24 +1743,22 @@ int PWMOut::fmu_new_mode(PortMode new_mode)
 		return -1;
 	}
 
-#if PWM_OUT_MAX_INSTANCES > 0
-	PWMOut *pwm0 = _objects[0].load(); // TODO: get_instance();
+	if (PWM_OUT_MAX_INSTANCES > 0) {
+		PWMOut *pwm0 = _objects[0].load(); // TODO: get_instance();
 
-	if (pwm0 && pwm_mode0 != pwm0->get_mode()) {
-		pwm0->request_mode(pwm_mode0);
+		if (pwm0 && pwm_mode0 != pwm0->get_mode()) {
+			pwm0->request_mode(pwm_mode0);
+		}
 	}
 
-#endif
+	if (PWM_OUT_MAX_INSTANCES > 1) {
+		PWMOut *pwm1 = _objects[1].load(); // TODO: get_instance();
 
-#if PWM_OUT_MAX_INSTANCES > 1
-	PWMOut *pwm1 = _objects[1].load(); // TODO: get_instance();
-
-	if (pwm1 && pwm_mode1 != pwm1->get_mode()) {
-		pwm1->request_mode(pwm_mode1);
+		if (pwm1 && pwm_mode1 != pwm1->get_mode()) {
+			pwm1->request_mode(pwm_mode1);
+		}
 	}
 
-#endif
-
 	return OK;
 }