platform/x86: acer-wmi: Cleanup ACER_CAP_FOO defines

[ Upstream commit 7c936d8d26afbc74deac0651d613dead2f76e81c ]

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: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20201019185628.264473-2-hdegoede@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 5592a92..75b1f6c 100644 (file)
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -206,14 +206,12 @@ struct hotkey_function_type_aa {
 /*
  * Interface capability flags
  */
-#define ACER_CAP_MAILLED               (1<<0)
-#define ACER_CAP_WIRELESS              (1<<1)
-#define ACER_CAP_BLUETOOTH             (1<<2)
-#define ACER_CAP_BRIGHTNESS            (1<<3)
-#define ACER_CAP_THREEG                        (1<<4)
-#define ACER_CAP_ACCEL                 (1<<5)
-#define ACER_CAP_RFBTN                 (1<<6)
-#define ACER_CAP_ANY                   (0xFFFFFFFF)
+#define ACER_CAP_MAILLED               BIT(0)
+#define ACER_CAP_WIRELESS              BIT(1)
+#define ACER_CAP_BLUETOOTH             BIT(2)
+#define ACER_CAP_BRIGHTNESS            BIT(3)
+#define ACER_CAP_THREEG                        BIT(4)
+#define ACER_CAP_ACCEL                 BIT(5)
 
 /*
  * Interface type flags
@@ -1253,10 +1251,8 @@ static void __init type_aa_dmi_decode(const struct dmi_header *header, void *d)
                interface->capability |= ACER_CAP_THREEG;
        if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_BLUETOOTH)
                interface->capability |= ACER_CAP_BLUETOOTH;
-       if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_RFBTN) {
-               interface->capability |= ACER_CAP_RFBTN;
+       if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_RFBTN)
                commun_func_bitmap &= ~ACER_WMID3_GDS_RFBTN;
-       }
 
        commun_fn_key_number = type_aa->commun_fn_key_number;
 }