Switch to the generic header check facility, and sunset the copy-pasted local version.
Keep the header checks gated on CONFIG_DRM_XE_WERROR as before. To be unified later. While at it, fix a header missing header guards that was not caught by the local version. Reported-by: Linus Torvalds <torva...@linux-foundation.org> Closes: https://lore.kernel.org/r/CAHk-=wjMrqzuUmH-mFbR_46EWEFS=bB=j7h9abmvy56vi81...@mail.gmail.com Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") 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/xe/Makefile | 10 ++-------- drivers/gpu/drm/xe/xe_pcode_api.h | 4 ++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index 9699b08585f7..2a1854024c84 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -326,14 +326,8 @@ ifneq ($(CONFIG_DRM_XE_DISPLAY),y) hdrtest_find_args += -not -path display/\* -not -path compat-i915-headers/\* -not -path xe_display.h endif -always-$(CONFIG_DRM_XE_WERROR) += \ - $(patsubst %.h,%.hdrtest, $(shell cd $(src) && find * -name '*.h' $(hdrtest_find_args))) - -quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@) - cmd_hdrtest = $(CC) -DHDRTEST $(filter-out $(CFLAGS_GCOV), $(c_flags)) -S -o /dev/null -x c /dev/null -include $<; touch $@ - -$(obj)/%.hdrtest: $(src)/%.h FORCE - $(call if_changed_dep,hdrtest) +header-check-$(CONFIG_DRM_XE_WERROR) += \ + $(shell cd $(src) && find * -name '*.h' $(hdrtest_find_args)) uses_generated_oob := $(addprefix $(obj)/, $(xe-y)) $(uses_generated_oob): $(obj)/generated/xe_wa_oob.h diff --git a/drivers/gpu/drm/xe/xe_pcode_api.h b/drivers/gpu/drm/xe/xe_pcode_api.h index 2bae9afdbd35..4fd58b3c0d9a 100644 --- a/drivers/gpu/drm/xe/xe_pcode_api.h +++ b/drivers/gpu/drm/xe/xe_pcode_api.h @@ -3,6 +3,9 @@ * Copyright © 2022 Intel Corporation */ +#ifndef _XE_PCODE_API_H_ +#define _XE_PCODE_API_H_ + /* Internal to xe_pcode */ #include "regs/xe_reg_defs.h" @@ -68,3 +71,4 @@ struct pcode_err_decode { const char *str; }; +#endif -- 2.39.5
