platform/x86: asus-wmi: Use backlight power constants

Replace FB_BLANK_ constants with their counterparts from the
backlight subsystem. The values are identical, so there's no
change in functionality or semantics.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: "Luke D. Jones" <luke@ljones.dev>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20240731125220.1147348-5-tzimmermann@suse.de
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 35ebb37..9c6b393 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -18,7 +18,6 @@
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/dmi.h>
-#include <linux/fb.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/init.h>
@@ -3883,7 +3882,7 @@ static int read_backlight_power(struct asus_wmi *asus)
        if (ret < 0)
                return ret;
 
-       return ret ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;
+       return ret ? BACKLIGHT_POWER_ON : BACKLIGHT_POWER_OFF;
 }
 
 static int read_brightness_max(struct asus_wmi *asus)
@@ -3942,7 +3941,7 @@ static int update_bl_status(struct backlight_device *bd)
 
        power = read_backlight_power(asus);
        if (power != -ENODEV && bd->props.power != power) {
-               ctrl_param = !!(bd->props.power == FB_BLANK_UNBLANK);
+               ctrl_param = !!(bd->props.power == BACKLIGHT_POWER_ON);
                err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT,
                                            ctrl_param, NULL);
                if (asus->driver->quirks->store_backlight_power)
@@ -4001,7 +4000,7 @@ static int asus_wmi_backlight_init(struct asus_wmi *asus)
 
        power = read_backlight_power(asus);
        if (power == -ENODEV)
-               power = FB_BLANK_UNBLANK;
+               power = BACKLIGHT_POWER_ON;
        else if (power < 0)
                return power;
 
@@ -4059,7 +4058,7 @@ static int read_screenpad_backlight_power(struct asus_wmi *asus)
        if (ret < 0)
                return ret;
        /* 1 == powered */
-       return ret ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;
+       return ret ? BACKLIGHT_POWER_ON : BACKLIGHT_POWER_OFF;
 }
 
 static int read_screenpad_brightness(struct backlight_device *bd)
@@ -4072,7 +4071,7 @@ static int read_screenpad_brightness(struct backlight_device *bd)
        if (err < 0)
                return err;
        /* The device brightness can only be read if powered, so return stored */
-       if (err == FB_BLANK_POWERDOWN)
+       if (err == BACKLIGHT_POWER_OFF)
                return asus->driver->screenpad_brightness - ASUS_SCREENPAD_BRIGHT_MIN;
 
        err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_SCREENPAD_LIGHT, &retval);
@@ -4093,7 +4092,7 @@ static int update_screenpad_bl_status(struct backlight_device *bd)
                return power;
 
        if (bd->props.power != power) {
-               if (power != FB_BLANK_UNBLANK) {
+               if (power != BACKLIGHT_POWER_ON) {
                        /* Only brightness > 0 can power it back on */
                        ctrl_param = asus->driver->screenpad_brightness - ASUS_SCREENPAD_BRIGHT_MIN;
                        err = asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_LIGHT,
@@ -4101,7 +4100,7 @@ static int update_screenpad_bl_status(struct backlight_device *bd)
                } else {
                        err = asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_POWER, 0, NULL);
                }
-       } else if (power == FB_BLANK_UNBLANK) {
+       } else if (power == BACKLIGHT_POWER_ON) {
                /* Only set brightness if powered on or we get invalid/unsync state */
                ctrl_param = bd->props.brightness + ASUS_SCREENPAD_BRIGHT_MIN;
                err = asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_LIGHT, ctrl_param, NULL);
@@ -4131,7 +4130,7 @@ static int asus_screenpad_init(struct asus_wmi *asus)
        if (power < 0)
                return power;
 
-       if (power != FB_BLANK_POWERDOWN) {
+       if (power != BACKLIGHT_POWER_OFF) {
                err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_SCREENPAD_LIGHT, &brightness);
                if (err < 0)
                        return err;