Switch to the generic header check facility, and sunset the copy-pasted local version.
Keep the header checks gated on CONFIG_DRM_I915_WERROR as before. To be unified later. Reported-by: Linus Torvalds <torva...@linux-foundation.org> Closes: https://lore.kernel.org/r/CAHk-=wjMrqzuUmH-mFbR_46EWEFS=bB=j7h9abmvy56vi81...@mail.gmail.com Fixes: c6d4a099a240 ("drm/i915: reimplement header test feature") Cc: Masahiro Yamada <masahi...@kernel.org> Cc: David Airlie <airl...@gmail.com> Cc: Simona Vetter <simona.vet...@ffwll.ch> Signed-off-by: Jani Nikula <jani.nik...@intel.com> --- Cc: linux-kbu...@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel...@lists.freedesktop.org Cc: intel-...@lists.freedesktop.org --- drivers/gpu/drm/i915/Makefile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index ed05b131ed3a..dca187e58bda 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -411,19 +411,9 @@ ifdef CONFIG_DRM_I915_WERROR cmd_checkdoc = $(srctree)/scripts/kernel-doc -none -Werror $< endif -# header test - # exclude some broken headers from the test coverage no-header-test := \ display/intel_vbt_defs.h -always-$(CONFIG_DRM_I915_WERROR) += \ - $(patsubst %.h,%.hdrtest, $(filter-out $(no-header-test), \ - $(shell cd $(src) && find * -name '*.h'))) - -quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@) - cmd_hdrtest = $(CC) $(filter-out $(CFLAGS_GCOV), $(c_flags)) -S -o /dev/null -x c /dev/null -include $<; \ - $(srctree)/scripts/kernel-doc -none -Werror $<; touch $@ - -$(obj)/%.hdrtest: $(src)/%.h FORCE - $(call if_changed_dep,hdrtest) +header-check-$(CONFIG_DRM_I915_WERROR) += \ + $(filter-out $(no-header-test),$(shell cd $(src) && find * -name '*.h')) -- 2.39.5
