| Message ID | 20220121132957.3778555-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: nuke local versions of WARN_ON/WARN_ON_ONCE | expand |
On Fri, Jan 21, 2022 at 03:29:57PM +0200, Jani Nikula wrote: >In general, we should avoid redefining kernel macros like this. It can >get confusing, and what gets used will depend on whether the header is >included or not. Moreover, we should prefer drm_WARN_ON() and >drm_WARN_ON_ONCE() anyway, which include the stringified error condition >in the message. > >Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Lucas De Marchi
On Fri, 21 Jan 2022, Lucas De Marchi <lucas.demarchi@intel.com> wrote: > On Fri, Jan 21, 2022 at 03:29:57PM +0200, Jani Nikula wrote: >>In general, we should avoid redefining kernel macros like this. It can >>get confusing, and what gets used will depend on whether the header is >>included or not. Moreover, we should prefer drm_WARN_ON() and >>drm_WARN_ON_ONCE() anyway, which include the stringified error condition >>in the message. >> >>Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > > Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Thanks, pushed to drm-intel-next. BR, Jani.
diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h index 7a5925072466..bfafd0afd117 100644 --- a/drivers/gpu/drm/i915/i915_utils.h +++ b/drivers/gpu/drm/i915/i915_utils.h @@ -37,21 +37,6 @@ struct timer_list; #define FDO_BUG_URL "https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs" -#undef WARN_ON -/* Many gcc seem to no see through this and fall over :( */ -#if 0 -#define WARN_ON(x) ({ \ - bool __i915_warn_cond = (x); \ - if (__builtin_constant_p(__i915_warn_cond)) \ - BUILD_BUG_ON(__i915_warn_cond); \ - WARN(__i915_warn_cond, "WARN_ON(" #x ")"); }) -#else -#define WARN_ON(x) WARN((x), "%s", "WARN_ON(" __stringify(x) ")") -#endif - -#undef WARN_ON_ONCE -#define WARN_ON_ONCE(x) WARN_ONCE((x), "%s", "WARN_ON_ONCE(" __stringify(x) ")") - #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \ __stringify(x), (long)(x))
In general, we should avoid redefining kernel macros like this. It can get confusing, and what gets used will depend on whether the header is included or not. Moreover, we should prefer drm_WARN_ON() and drm_WARN_ON_ONCE() anyway, which include the stringified error condition in the message. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_utils.h | 15 --------------- 1 file changed, 15 deletions(-)