[PATCH] drm/xe: use IS_ENABLED() instead of defined() on config options

Dixit, Ashutosh ashutosh.dixit at intel.com
Wed Sep 4 15:54:40 UTC 2024


On Wed, 04 Sep 2024 07:52:31 -0700, Jani Nikula wrote:
>
> Prefer IS_ENABLED() instead of defined() for checking whether a kconfig
> option is enabled.

Reviewed-by: Ashutosh Dixit <ashutosh.dixit at intel.com>

>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_bo.c                  | 2 +-
>  drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c | 2 +-
>  drivers/gpu/drm/xe/xe_guc.c                 | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> index 06911e9a3bf5..53948a965404 100644
> --- a/drivers/gpu/drm/xe/xe_bo.c
> +++ b/drivers/gpu/drm/xe/xe_bo.c
> @@ -468,7 +468,7 @@ static int xe_ttm_io_mem_reserve(struct ttm_device *bdev,
>		mem->bus.offset += vram->io_start;
>		mem->bus.is_iomem = true;
>
> -#if  !defined(CONFIG_X86)
> +#if  !IS_ENABLED(CONFIG_X86)
>		mem->bus.caching = ttm_write_combined;
>  #endif
>		return 0;
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c
> index f3ddcbefc6bc..2ed5b6780d30 100644
> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c
> @@ -33,7 +33,7 @@ static const struct drm_info_list vf_info[] = {
>		.show = xe_gt_debugfs_simple_show,
>		.data = xe_gt_sriov_vf_print_version,
>	},
> -#if defined(CONFIG_DRM_XE_DEBUG) || defined(CONFIG_DRM_XE_DEBUG_SRIOV)
> +#if IS_ENABLED(CONFIG_DRM_XE_DEBUG) || IS_ENABLED(CONFIG_DRM_XE_DEBUG_SRIOV)
>	{
>		"runtime_regs",
>		.show = xe_gt_debugfs_simple_show,
> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
> index 52df28032a6f..db667850c8b8 100644
> --- a/drivers/gpu/drm/xe/xe_guc.c
> +++ b/drivers/gpu/drm/xe/xe_guc.c
> @@ -583,7 +583,7 @@ static s32 guc_pc_get_cur_freq(struct xe_guc_pc *guc_pc)
>   * extreme thermal throttling. And a system that is that hot during boot is probably
>   * dead anyway!
>   */
> -#if defined(CONFIG_DRM_XE_DEBUG)
> +#if IS_ENABLED(CONFIG_DRM_XE_DEBUG)
>  #define GUC_LOAD_RETRY_LIMIT	20
>  #else
>  #define GUC_LOAD_RETRY_LIMIT	3
> --
> 2.39.2
>


More information about the Intel-xe mailing list