linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] amd/amdgpu: optimise CONFIG_X||CONFIG_X_MODULE to IS_ENABLED(X)
@ 2020-11-18  3:43 Bernard Zhao
  2020-11-18  8:19 ` Christian König
  0 siblings, 1 reply; 2+ messages in thread
From: Bernard Zhao @ 2020-11-18  3:43 UTC (permalink / raw)
  To: Alex Deucher, Christian König, David Airlie, Daniel Vetter,
	Ye Bin, Evan Quan, Andriy Gapon, Luben Tuikov, Bernard Zhao,
	amd-gfx, dri-devel, linux-kernel
  Cc: opensource.kernel

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@vivo.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)
-- 
2.29.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] amd/amdgpu: optimise CONFIG_X||CONFIG_X_MODULE to IS_ENABLED(X)
  2020-11-18  3:43 [PATCH] amd/amdgpu: optimise CONFIG_X||CONFIG_X_MODULE to IS_ENABLED(X) Bernard Zhao
@ 2020-11-18  8:19 ` Christian König
  0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2020-11-18  8:19 UTC (permalink / raw)
  To: Bernard Zhao, Alex Deucher, David Airlie, Daniel Vetter, Ye Bin,
	Evan Quan, Andriy Gapon, Luben Tuikov, amd-gfx, dri-devel,
	linux-kernel
  Cc: opensource.kernel

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@vivo.com>

Acked-by: Christian König <christian.koenig@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)


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-11-18  8:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-18  3:43 [PATCH] amd/amdgpu: optimise CONFIG_X||CONFIG_X_MODULE to IS_ENABLED(X) Bernard Zhao
2020-11-18  8:19 ` Christian König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).