Skip to contentSkip to conversation

ACPI: use IS_ENABLED() to simplify built-in or module checks

PATCH Applied Lalit Shankar Chowdhury 3 participants 4 messages Sep 21 – Sep 23 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ACPI: use IS_ENABLED() to simplify built-in or module checks

Replace the remaining built-in/module check for CONFIG_ACPI_WMI with IS_ENABLED() macro.

---
 include/linux/acpi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/acpi.h +1 -1
index ddacac812094..b590f520dc57 100644
@@ -434,7 +434,7 @@ extern acpi_handle ec_get_handle(void);
 
 extern bool acpi_is_pnp_device(struct acpi_device *);
 
-#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
+#if IS_ENABLED(CONFIG_ACPI_WMI)
 
 typedef void (*wmi_notify_handler) (union acpi_object *data, void *context);
 
Signature · 1 line
2.53.0
#1 lore raw

+Armin

Quoted 26 lines · Lalit Shankar Chowdhury

Replace the remaining built-in/module check for CONFIG_ACPI_WMI with IS_ENABLED() macro.

---
 include/linux/acpi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/acpi.h +1 -2
index ddacac812094..b590f520dc57 100644
@@ -434,7 +434,7 @@ extern acpi_handle ec_get_handle(void);
 
 extern bool acpi_is_pnp_device(struct acpi_device *);
 
-#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
+#if IS_ENABLED(CONFIG_ACPI_WMI)
 
 typedef void (*wmi_notify_handler) (union acpi_object *data, void *context);
 
--

2.53.0

Reviewed-by
#2 lore raw

Am 22.09.26 um 18:43 schrieb Rafael J. Wysocki (Intel):

Quoted 6 lines

+Armin

Quoted 2 lines · Lalit Shankar Chowdhury

Replace the remaining built-in/module check for CONFIG_ACPI_WMI with IS_ENABLED() macro.

Quoted 22 lines
Quoted 22 lines
---
  include/linux/acpi.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/acpi.h +1 -2
index ddacac812094..b590f520dc57 100644
@@ -434,7 +434,7 @@ extern acpi_handle ec_get_handle(void);
 
  extern bool acpi_is_pnp_device(struct acpi_device *);
 
-#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
+#if IS_ENABLED(CONFIG_ACPI_WMI)
 
  typedef void (*wmi_notify_handler) (union acpi_object *data, void *context);
 
--

2.53.0

maintainer Applied
#3 lore raw
Quoted 11 lines · Armin Wolf

Am 22.09.26 um 18:43 schrieb Rafael J. Wysocki (Intel):

Quoted 6 lines

+Armin

Quoted 2 lines · Lalit Shankar Chowdhury

Replace the remaining built-in/module check for CONFIG_ACPI_WMI with IS_ENABLED() macro.

Applied as 7.4 material, thanks!

Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
---
  include/linux/acpi.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/acpi.h +1 -2
index ddacac812094..b590f520dc57 100644
@@ -434,7 +434,7 @@ extern acpi_handle ec_get_handle(void);
 
  extern bool acpi_is_pnp_device(struct acpi_device *);
 
-#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
+#if IS_ENABLED(CONFIG_ACPI_WMI)
 
  typedef void (*wmi_notify_handler) (union acpi_object *data, void *context);
 
--

2.53.0