include/linux/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Replace the remaining built-in/module check for CONFIG_ACPI_WMI
with IS_ENABLED() macro.
Signed-off-by: Lalit Shankar Chowdhury <lalitshankarch@gmail.com>
---
include/linux/acpi.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index ddacac812094..b590f520dc57 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -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
+Armin On Mon, Sep 21, 2026 at 10:14 AM Lalit Shankar Chowdhury <lalitshankarch@gmail.com> wrote: > > Replace the remaining built-in/module check for CONFIG_ACPI_WMI > with IS_ENABLED() macro. > > Signed-off-by: Lalit Shankar Chowdhury <lalitshankarch@gmail.com> > --- > include/linux/acpi.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index ddacac812094..b590f520dc57 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -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 > >
Am 22.09.26 um 18:43 schrieb Rafael J. Wysocki (Intel): > +Armin > > On Mon, Sep 21, 2026 at 10:14 AM Lalit Shankar Chowdhury > <lalitshankarch@gmail.com> wrote: >> Replace the remaining built-in/module check for CONFIG_ACPI_WMI >> with IS_ENABLED() macro. Reviewed-by: Armin Wolf <W_Armin@gmx.de> >> Signed-off-by: Lalit Shankar Chowdhury <lalitshankarch@gmail.com> >> --- >> include/linux/acpi.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/include/linux/acpi.h b/include/linux/acpi.h >> index ddacac812094..b590f520dc57 100644 >> --- a/include/linux/acpi.h >> +++ b/include/linux/acpi.h >> @@ -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 >> >>
On Tue, Sep 22, 2026 at 9:40 PM Armin Wolf <W_Armin@gmx.de> wrote: > > Am 22.09.26 um 18:43 schrieb Rafael J. Wysocki (Intel): > > > +Armin > > > > On Mon, Sep 21, 2026 at 10:14 AM Lalit Shankar Chowdhury > > <lalitshankarch@gmail.com> wrote: > >> Replace the remaining built-in/module check for CONFIG_ACPI_WMI > >> with IS_ENABLED() macro. > > Reviewed-by: Armin Wolf <W_Armin@gmx.de> Applied as 7.4 material, thanks! > >> Signed-off-by: Lalit Shankar Chowdhury <lalitshankarch@gmail.com> > >> --- > >> include/linux/acpi.h | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/include/linux/acpi.h b/include/linux/acpi.h > >> index ddacac812094..b590f520dc57 100644 > >> --- a/include/linux/acpi.h > >> +++ b/include/linux/acpi.h > >> @@ -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 > >> > >>
© 2016 - 2026 Red Hat, Inc.