diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-25 14:59:42 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-26 09:25:25 +0100 |
| commit | babaab2f473817f173a2d08e410c25abf5ed0f6b (patch) | |
| tree | 11baa146d214cf45ab69487e518cc29d4898bd7f /drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | |
| parent | 2d69c42e373fa1ae2d4e27f7b11e61978d07c6d3 (diff) | |
drm/i915: Encapsulate kconfig constant values inside boolean predicates
Avoid angering clang and smatch by using a constant value in a '&&' test,
by forcing that constant value into a boolean.
E.g.,
drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c:159:13: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand]
if (!delay && CONFIG_DRM_I915_PREEMPT_TIMEOUT) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191025135943.12524-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c index 9977f59f6b53..5051f304705b 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c @@ -133,7 +133,7 @@ out: void intel_engine_unpark_heartbeat(struct intel_engine_cs *engine) { - if (!CONFIG_DRM_I915_HEARTBEAT_INTERVAL) + if (!IS_ACTIVE(CONFIG_DRM_I915_HEARTBEAT_INTERVAL)) return; next_heartbeat(engine); @@ -156,7 +156,7 @@ int intel_engine_set_heartbeat(struct intel_engine_cs *engine, int err; /* Send one last pulse before to cleanup persistent hogs */ - if (!delay && CONFIG_DRM_I915_PREEMPT_TIMEOUT) { + if (!delay && IS_ACTIVE(CONFIG_DRM_I915_PREEMPT_TIMEOUT)) { err = intel_engine_pulse(engine); if (err) return err; |