HID: logitech-hidpp: create a capabilities bits field

Do not pollute the quirks bits field which is public API
with elements that are queried from the device.

Move the 2 battery capabilities into the new field.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 4031405ac191d8bc83e9948ff32934aa72f26fc1..4ee466c825028c288532e774269388d17daca99d 100644 (file)
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -62,11 +62,12 @@ MODULE_PARM_DESC(disable_tap_to_click,
 #define HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS       BIT(22)
 #define HIDPP_QUIRK_NO_HIDINPUT                        BIT(23)
 #define HIDPP_QUIRK_FORCE_OUTPUT_REPORTS       BIT(24)
-#define HIDPP_QUIRK_HIDPP20_BATTERY            BIT(25)
-#define HIDPP_QUIRK_HIDPP10_BATTERY            BIT(26)
 
 #define HIDPP_QUIRK_DELAYED_INIT               HIDPP_QUIRK_NO_HIDINPUT
 
+#define HIDPP_CAPABILITY_HIDPP10_BATTERY       BIT(0)
+#define HIDPP_CAPABILITY_HIDPP20_BATTERY       BIT(1)
+
 /*
  * There are two hidpp protocols in use, the first version hidpp10 is known
  * as register access protocol or RAP, the second version hidpp20 is known as
@@ -138,6 +139,7 @@ struct hidpp_device {
        struct input_dev *delayed_input;
 
        unsigned long quirks;
+       unsigned long capabilities;
 
        struct hidpp_battery battery;
 };
@@ -834,7 +836,7 @@ static int hidpp_initialize_battery(struct hidpp_device *hidpp)
        if (hidpp->protocol_major >= 2) {
                ret = hidpp20_initialize_battery(hidpp);
                if (ret == 0)
-                       hidpp->quirks |= HIDPP_QUIRK_HIDPP20_BATTERY;
+                       hidpp->capabilities |= HIDPP_CAPABILITY_HIDPP20_BATTERY;
        }
 
        return ret;
@@ -2283,7 +2285,7 @@ static int hidpp_raw_event(struct hid_device *hdev, struct hid_report *report,
        if (ret != 0)
                return ret;
 
-       if (hidpp->quirks & HIDPP_QUIRK_HIDPP20_BATTERY) {
+       if (hidpp->capabilities & HIDPP_CAPABILITY_HIDPP20_BATTERY) {
                ret = hidpp20_battery_event(hidpp, data, size);
                if (ret != 0)
                        return ret;