To avoid compilers complainig about ambigious else blocks when putting an if condition into a for_each macro one needs to invert the condition and add a dummy else. We have a nice little convenience macro for that in drm headers, let's move it out. Subsequent patches will roll it out to other places.
Motivated by a discussion with Andy and Yisheng, who want to add another for_each_macro which would benefit from for_each_if() instead of hand-rolling it. Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> Cc: Gustavo Padovan <gust...@padovan.org> Cc: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Cc: Sean Paul <seanp...@chromium.org> Cc: David Airlie <airl...@linux.ie> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Kees Cook <keesc...@chromium.org> Cc: Ingo Molnar <mi...@kernel.org> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: NeilBrown <ne...@suse.com> Cc: Wei Wang <w...@google.com> Cc: Stefan Agner <ste...@agner.ch> Cc: Andrei Vagin <ava...@openvz.org> Cc: Randy Dunlap <rdun...@infradead.org> Cc: Andy Shevchenko <andriy.shevche...@linux.intel.com> Cc: Yisheng Xie <ys...@foxmail.com> --- include/drm/drmP.h | 3 --- include/linux/kernel.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index f7a19c2a7a80..05350424a4d3 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -110,7 +110,4 @@ static inline bool drm_can_sleep(void) return true; } -/* helper for handling conditionals in various for_each macros */ -#define for_each_if(condition) if (!(condition)) {} else - #endif diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 941dc0a5a877..4cb95ab9a5bc 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -71,6 +71,9 @@ */ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) +/* helper for handling conditionals in various for_each macros */ +#define for_each_if(condition) if (!(condition)) {} else + #define u64_to_user_ptr(x) ( \ { \ typecheck(u64, x); \ -- 2.18.0