Skip to content

Commit 84f9c3c

Browse files
committed
drm/i915: annotate maybe unused but set intel_crtc_state variables
Prepare for re-enabling -Wunused-but-set-variable. for_each_new_intel_crtc_in_state() requires passing in a struct intel_crtc_state pointer, which it uses, but in a few places this leads to warning about unused but set variables. Annotate them with __maybe_unused. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Jouni Högander <jouni.hogander@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/eb041f426bc3d76ef7a0ea906f99367cbf439b1a.1685119007.git.jani.nikula@intel.com
1 parent ace8730 commit 84f9c3c

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5715,7 +5715,7 @@ static int intel_atomic_check_planes(struct intel_atomic_state *state)
57155715

57165716
static int intel_atomic_check_crtcs(struct intel_atomic_state *state)
57175717
{
5718-
struct intel_crtc_state *crtc_state;
5718+
struct intel_crtc_state __maybe_unused *crtc_state;
57195719
struct intel_crtc *crtc;
57205720
int i;
57215721

drivers/gpu/drm/i915/display/skl_watermark.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2900,7 +2900,7 @@ static int
29002900
skl_compute_wm(struct intel_atomic_state *state)
29012901
{
29022902
struct intel_crtc *crtc;
2903-
struct intel_crtc_state *new_crtc_state;
2903+
struct intel_crtc_state __maybe_unused *new_crtc_state;
29042904
int ret, i;
29052905

29062906
for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) {

0 commit comments

Comments
 (0)