Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID update from Jiri Kosina:

 - Wacom driver fixes/updates (device name generation improvements,
   touch ring status support) from Jason Gerecke

 - T100 touchpad support from Hans de Goede

 - support for batteries driven by HID input reports, from Dmitry
   Torokhov

 - Arnd pointed out that driver_lock semaphore is superfluous, as driver
   core already provides all the necessary concurency protection.
   Removal patch from Binoy Jayan

 - logical minimum numbering improvements in sensor-hub driver, from
   Srinivas Pandruvada

 - support for Microsoft Win8 Wireless Radio Controls extensions from
   João Paulo Rechi Vita

 - assorted small fixes and device ID additions

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (28 commits)
  HID: prodikeys: constify snd_rawmidi_ops structures
  HID: sensor: constify platform_device_id
  HID: input: throttle battery uevents
  HID: usbmouse: constify usb_device_id and fix space before '[' error
  HID: usbkbd: constify usb_device_id and fix space before '[' error.
  HID: hid-sensor-hub: Force logical minimum to 1 for power and report state
  HID: wacom: Do not completely map WACOM_HID_WD_TOUCHRINGSTATUS usage
  HID: asus: Add T100CHI bluetooth keyboard dock touchpad support
  HID: ntrig: constify attribute_group structures.
  HID: logitech-hidpp: constify attribute_group structures.
  HID: sensor: constify attribute_group structures.
  HID: multitouch: constify attribute_group structures.
  HID: multitouch: use proper symbolic constant for 0xff310076 application
  HID: multitouch: Support Asus T304UA media keys
  HID: multitouch: Support HID_GD_WIRELESS_RADIO_CTLS
  HID: input: optionally use device id in battery name
  HID: input: map digitizer battery usage
  HID: Remove the semaphore driver_lock
  HID: wacom: add USB_HID dependency
  HID: add ALWAYS_POLL quirk for Logitech 0xc077
  ...

1 files changed, 16 insertions, 2 deletions

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 6519cdc4c7d3..ab05a86269dc 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -173,6 +173,7 @@ struct hid_item {
 #define HID_UP_LOGIVENDOR3   0xff430000
 #define HID_UP_LNVENDOR         0xffa00000
 #define HID_UP_SENSOR           0x00200000
+#define HID_UP_ASUSVENDOR       0xff310000
 
 #define HID_USAGE               0x0000ffff
 
@@ -292,6 +293,7 @@ struct hid_item {
 #define HID_DG_BARRELSWITCH2    0x000d005a
 #define HID_DG_TOOLSERIALNUMBER 0x000d005b
 
+#define HID_VD_ASUS_CUSTOM_MEDIA_KEYS   0xff310076
 /*
  * HID report types --- Ouch! HID spec says 1 2 3!
  */
@@ -532,7 +534,6 @@ struct hid_device {							/* device report descriptor */
         struct hid_report_enum report_enum[HID_REPORT_TYPES];
         struct work_struct led_work;                                    /* delayed LED worker */
 
-        struct semaphore driver_lock;                                   /* protects the current driver, except during input */
         struct semaphore driver_input_lock;                             /* protects the current driver */
         struct device dev;                                              /* device */
         struct hid_driver *driver;
@@ -548,16 +549,18 @@ struct hid_device {							/* device report descriptor */
          * battery is non-NULL.
          */
         struct power_supply *battery;
+        __s32 battery_capacity;
         __s32 battery_min;
         __s32 battery_max;
         __s32 battery_report_type;
         __s32 battery_report_id;
+        bool battery_reported;
 #endif
 
         unsigned int status;                                            /* see STAT flags above */
         unsigned claimed;                                               /* Claimed by hidinput, hiddev? */
         unsigned quirks;                                                /* Various quirks the device can pull on us */
-        bool io_started;                                                /* Protected by driver_lock. If IO has started */
+        bool io_started;                                                /* If IO has started */
 
         struct list_head inputs;                                        /* The list of inputs */
         void *hiddev;                                                   /* The hiddev structure */
@@ -783,6 +786,17 @@ struct hid_ll_driver {
         int (*idle)(struct hid_device *hdev, int report, int idle, int reqtype);
 };
 
+extern struct hid_ll_driver i2c_hid_ll_driver;
+extern struct hid_ll_driver hidp_hid_driver;
+extern struct hid_ll_driver uhid_hid_driver;
+extern struct hid_ll_driver usb_hid_driver;
+
+static inline bool hid_is_using_ll_driver(struct hid_device *hdev,
+                struct hid_ll_driver *driver)
+{
+        return hdev->ll_driver == driver;
+}
+
 #define PM_HINT_FULLON  1<<5
 #define PM_HINT_NORMAL  1<<1