From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4AFCC433EF for ; Wed, 29 Sep 2021 18:34:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C7B8B61528 for ; Wed, 29 Sep 2021 18:34:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346258AbhI2SgC (ORCPT ); Wed, 29 Sep 2021 14:36:02 -0400 Received: from mga18.intel.com ([134.134.136.126]:24848 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346190AbhI2Sf7 (ORCPT ); Wed, 29 Sep 2021 14:35:59 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10122"; a="212095105" X-IronPort-AV: E=Sophos;i="5.85,332,1624345200"; d="scan'208";a="212095105" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 11:34:16 -0700 X-IronPort-AV: E=Sophos;i="5.85,332,1624345200"; d="scan'208";a="520927756" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.202]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 11:34:16 -0700 From: Lucas De Marchi To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] Move IS_CONFIG_NONZERO() to kconfig.h Date: Wed, 29 Sep 2021 11:33:57 -0700 Message-Id: <20210929183357.1490204-4-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929183357.1490204-1-lucas.demarchi@intel.com> References: <20210929183357.1490204-1-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The check for config value doesn't really belong to i915_utils.h - we are trying to eliminate that utils helper and share them when possible with other drivers and subsystems. Rationale for having such macro is in commit babaab2f4738 ("drm/i915: Encapsulate kconfig constant values inside boolean predicates") whereas later it is improved to not break the build if used with undefined configs. The caveat is detailed in the documentation: unlike IS_ENABLED(): it's not preprocessor-only logic so can't be used for things like `#if IS_CONFIG_NONZERO(...)` Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/i915/i915_utils.h | 17 ----------------- include/linux/kconfig.h | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h index 436ce612c46a..62f189e064a9 100644 --- a/drivers/gpu/drm/i915/i915_utils.h +++ b/drivers/gpu/drm/i915/i915_utils.h @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -459,20 +458,4 @@ static inline bool timer_expired(const struct timer_list *t) return timer_active(t) && !timer_pending(t); } -/* - * This is a lookalike for IS_ENABLED() that takes a kconfig value, - * e.g. CONFIG_DRM_I915_SPIN_REQUEST, and evaluates whether it is non-zero - * i.e. whether the configuration is active. Wrapping up the config inside - * a boolean context prevents clang and smatch from complaining about potential - * issues in confusing logical-&& with bitwise-& for constants. - * - * Sadly IS_ENABLED() itself does not work with kconfig values. - * - * Returns 0 if @config is 0, 1 if set to any value. - */ -#define IS_CONFIG_NONZERO(config) ( \ - (__stringify_1(config)[0] > '0' && __stringify_1(config)[0] < '9') || \ - __stringify_1(config)[0] == '-' \ -) - #endif /* !__I915_UTILS_H */ diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h index 20d1079e92b4..e84f7c1c8e26 100644 --- a/include/linux/kconfig.h +++ b/include/linux/kconfig.h @@ -2,6 +2,7 @@ #ifndef __LINUX_KCONFIG_H #define __LINUX_KCONFIG_H +#include #include #ifdef CONFIG_CPU_BIG_ENDIAN @@ -26,8 +27,8 @@ #define ____or(arg1_or_junk, y) __take_second_arg(arg1_or_junk 1, y) /* - * Helper macros to use CONFIG_ options in C/CPP expressions. Note that - * these only work with boolean and tristate options. + * Helper macros to use CONFIG_ options in C/CPP expressions. Note that except + * for IS_CONFIG_NONZERO, these only work with boolean and tristate options. */ /* @@ -72,4 +73,15 @@ */ #define IS_ENABLED(option) __or(IS_BUILTIN(option), IS_MODULE(option)) +/* + * This is a lookalike for IS_ENABLED(), but works with int kconfig options + * with the caveat that it can't be used on preprocessor checks. + * + * Returns 0 if @config is 0 or undefined, 1 if set to any value. + */ +#define IS_CONFIG_NONZERO(config) ( \ + (__stringify_1(config)[0] > '0' && __stringify_1(config)[0] < '9') || \ + __stringify_1(config)[0] == '-' \ +) + #endif /* __LINUX_KCONFIG_H */ -- 2.33.0