[PATCH] amd/amdgpu: optimise CONFIG_X||CONFIG_X_MODULE to IS_ENABLED(X)

Christian König christian.koenig at amd.com
Wed Nov 18 08:19:52 UTC 2020


Am 18.11.20 um 04:43 schrieb Bernard Zhao:
> Optimise CONFIG_<X> || CONFIG_<X>_MODULE to IS_ENABLED(<X>).
> This change also fix check_patch.pl warning:
> WARNING: Prefer IS_ENABLED(<FOO>) to CONFIG_<FOO> ||
> CONFIG_<FOO>_MODULE
> +#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined
> (CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
>
> Signed-off-by: Bernard Zhao <bernard at vivo.com>

Acked-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> index 165b02e267b0..f1980cd1f402 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> @@ -64,7 +64,7 @@ struct amdgpu_atif {
>   	struct amdgpu_atif_notifications notifications;
>   	struct amdgpu_atif_functions functions;
>   	struct amdgpu_atif_notification_cfg notification_cfg;
> -#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
> +#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
>   	struct backlight_device *bd;
>   #endif
>   	struct amdgpu_dm_backlight_caps backlight_caps;
> @@ -447,7 +447,7 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev,
>   		DRM_DEBUG_DRIVER("ATIF: %d pending SBIOS requests\n", count);
>   
>   		if (req.pending & ATIF_PANEL_BRIGHTNESS_CHANGE_REQUEST) {
> -#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
> +#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
>   			if (atif->bd) {
>   				DRM_DEBUG_DRIVER("Changing brightness to %d\n",
>   						 req.backlight_level);
> @@ -806,7 +806,7 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
>   	}
>   	adev->atif = atif;
>   
> -#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
> +#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
>   	if (atif->notifications.brightness_change) {
>   		if (amdgpu_device_has_dc_support(adev)) {
>   #if defined(CONFIG_DRM_AMD_DC)



More information about the dri-devel mailing list