diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_utils.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_utils.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h index 4f75115b87d6..ecc20e0528f4 100644 --- a/drivers/gpu/drm/i915/i915_utils.h +++ b/drivers/gpu/drm/i915/i915_utils.h @@ -38,42 +38,18 @@ struct drm_i915_private; -#ifndef MISSING_CASE #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \ __stringify(x), (long)(x)) -#endif - -#if IS_ENABLED(CONFIG_DRM_I915_DEBUG) - -int __i915_inject_probe_error(struct drm_i915_private *i915, int err, - const char *func, int line); -#define i915_inject_probe_error(_i915, _err) \ - __i915_inject_probe_error((_i915), (_err), __func__, __LINE__) -bool i915_error_injected(void); - -#else - -#define i915_inject_probe_error(i915, e) ({ BUILD_BUG_ON_INVALID(i915); 0; }) -#define i915_error_injected() false - -#endif - -#define i915_inject_probe_failure(i915) i915_inject_probe_error((i915), -ENODEV) #define i915_probe_error(i915, fmt, ...) ({ \ - if (i915_error_injected()) \ - drm_dbg(&(i915)->drm, fmt, ##__VA_ARGS__); \ - else \ - drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \ + drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \ }) -#ifndef fetch_and_zero #define fetch_and_zero(ptr) ({ \ typeof(*ptr) __T = *(ptr); \ *(ptr) = (typeof(*ptr))0; \ __T; \ }) -#endif /* * check_user_mbz: Check that a user value exists and is zero |