| From 42d25564ab88599c101af3cf2e253933d820c076 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 19 Oct 2020 20:56:24 +0200 |
| Subject: platform/x86: acer-wmi: Cleanup ACER_CAP_FOO defines |
| |
| From: Hans de Goede <hdegoede@redhat.com> |
| |
| [ 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> |
| --- |
| drivers/platform/x86/acer-wmi.c | 18 +++++++----------- |
| 1 file changed, 7 insertions(+), 11 deletions(-) |
| |
| diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c |
| index 29f6f2bbb5ff..41311c1526a0 100644 |
| --- a/drivers/platform/x86/acer-wmi.c |
| +++ b/drivers/platform/x86/acer-wmi.c |
| @@ -218,14 +218,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 |
| @@ -1268,10 +1266,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; |
| } |
| -- |
| 2.30.1 |
| |
