With the i915 switch to generic fault injection, display no longer needs the compat i915_utils.h. Remove it, along with a few includes.
Signed-off-by: Jani Nikula <[email protected]> --- drivers/gpu/drm/i915/display/intel_connector.c | 2 -- drivers/gpu/drm/i915/display/intel_display_driver.c | 2 -- drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h | 7 ------- 3 files changed, 11 deletions(-) delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c index c128bc4215c4..682bf1be350d 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.c +++ b/drivers/gpu/drm/i915/display/intel_connector.c @@ -31,8 +31,6 @@ #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include "i915_drv.h" -#include "i915_utils.h" /* for i915_inject_probe_failure() */ #include "intel_connector.h" #include "intel_display_core.h" #include "intel_display_debugfs.h" diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index e1d29aea0ddc..240acf599670 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -18,8 +18,6 @@ #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> -#include "i915_drv.h" -#include "i915_utils.h" /* for i915_inject_probe_failure() */ #include "i9xx_wm.h" #include "intel_acpi.h" #include "intel_atomic.h" diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h deleted file mode 100644 index 3639721f0bf8..000000000000 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Copyright © 2023 Intel Corporation - */ - -/* for a couple of users under i915/display */ -#define i915_inject_probe_failure(unused) ((unused) && 0) -- 2.47.3
