Commit 7c936d8d authored by Hans de Goede's avatar Hans de Goede

platform/x86: acer-wmi: Cleanup ACER_CAP_FOO defines

Cleanup the ACER_CAP_FOO defines:
-Switch to using BIT() macro.
-The ACER_CAP_RFBTN flag is set, but it is never checked anywhere, drop it.
-Drop the unused ACER_CAP_ANY define.
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20201019185628.264473-2-hdegoede@redhat.com
parent 6b723f42
...@@ -205,14 +205,12 @@ struct hotkey_function_type_aa { ...@@ -205,14 +205,12 @@ struct hotkey_function_type_aa {
/* /*
* Interface capability flags * Interface capability flags
*/ */
#define ACER_CAP_MAILLED (1<<0) #define ACER_CAP_MAILLED BIT(0)
#define ACER_CAP_WIRELESS (1<<1) #define ACER_CAP_WIRELESS BIT(1)
#define ACER_CAP_BLUETOOTH (1<<2) #define ACER_CAP_BLUETOOTH BIT(2)
#define ACER_CAP_BRIGHTNESS (1<<3) #define ACER_CAP_BRIGHTNESS BIT(3)
#define ACER_CAP_THREEG (1<<4) #define ACER_CAP_THREEG BIT(4)
#define ACER_CAP_ACCEL (1<<5) #define ACER_CAP_ACCEL BIT(5)
#define ACER_CAP_RFBTN (1<<6)
#define ACER_CAP_ANY (0xFFFFFFFF)
/* /*
* Interface type flags * Interface type flags
...@@ -1246,10 +1244,8 @@ static void __init type_aa_dmi_decode(const struct dmi_header *header, void *d) ...@@ -1246,10 +1244,8 @@ static void __init type_aa_dmi_decode(const struct dmi_header *header, void *d)
interface->capability |= ACER_CAP_THREEG; interface->capability |= ACER_CAP_THREEG;
if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_BLUETOOTH) if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_BLUETOOTH)
interface->capability |= ACER_CAP_BLUETOOTH; interface->capability |= ACER_CAP_BLUETOOTH;
if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_RFBTN) { if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_RFBTN)
interface->capability |= ACER_CAP_RFBTN;
commun_func_bitmap &= ~ACER_WMID3_GDS_RFBTN; commun_func_bitmap &= ~ACER_WMID3_GDS_RFBTN;
}
commun_fn_key_number = type_aa->commun_fn_key_number; commun_fn_key_number = type_aa->commun_fn_key_number;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment