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

Pull HID updates from Jiri Kosina:

 - quite a few firmware fixes for RMI driver by Andrew Duggan

 - huion and uclogic drivers have been substantially overlaping in
   functionality laterly.  This redundancy is fixed by hid-huion driver
   being merged into hid-uclogic; work done by Benjamin Tissoires and
   Nikolai Kondrashov

 - i2c-hid now supports ACPI GPIO interrupts; patch from Mika Westerberg

 - Some of the quirks, that got separated into individual drivers, have
   historically had EXPERT dependency.  As HID subsystem matured (as
   well as the individual drivers), this made less and less sense.  This
   dependency is now being removed by patch from Jean Delvare

 - Logitech lg4ff driver received a couple of improvements for mode
   switching, by Michal Malý

 - multitouch driver now supports clickpads, patches by Benjamin
   Tissoires and Seth Forshee

 - hid-sensor framework received a substantial update; namely support
   for Custom and Generic pages is being added; work done by Srinivas
   Pandruvada

 - wacom driver received substantial update; it now supports
   i2c-conntected devices (Mika Westerberg), Bamboo PADs are now
   properly supported (Benjamin Tissoires), much improved battery
   reporting (Jason Gerecke) and pen proximity cleanups (Ping Cheng)

 - small assorted fixes and device ID additions

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (68 commits)
  HID: sensor: Update document for custom sensor
  HID: sensor: Custom and Generic sensor support
  HID: debug: fix error handling in hid_debug_events_read()
  Input - mt: Fix input_mt_get_slot_by_key
  HID: logitech-hidpp: fix error return code
  HID: wacom: Add support for Cintiq 13HD Touch
  HID: logitech-hidpp: add a module parameter to keep firmware gestures
  HID: usbhid: yet another mouse with ALWAYS_POLL
  HID: usbhid: more mice with ALWAYS_POLL
  HID: wacom: set stylus_in_proximity before checking touch_down
  HID: wacom: use wacom_wac_finger_count_touches to set touch_down
  HID: wacom: remove hardcoded WACOM_QUIRK_MULTI_INPUT
  HID: pidff: effect can't be NULL
  HID: add quirk for PIXART OEM mouse used by HP
  HID: add HP OEM mouse to quirk ALWAYS_POLL
  HID: wacom: ask for a in-prox report when it was missed
  HID: hid-sensor-hub: Fix sparse warning
  HID: hid-sensor-hub: fix attribute read for logical usage id
  HID: plantronics: fix Kconfig default
  HID: pidff: support more than one concurrent effect
  ...

9 files changed, 33 insertions, 25 deletions

diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index df6a593bd4bd..2b4fad6998c1 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -123,7 +123,8 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
                         *val = sensor_hub_input_attr_get_raw_value(
                                         accel_state->common_attributes.hsdev,
                                         HID_USAGE_SENSOR_ACCEL_3D, address,
-                                        report_id);
+                                        report_id,
+                                        SENSOR_HUB_SYNC);
                 else {
                         *val = 0;
                         hid_sensor_power_state(&accel_state->common_attributes,
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
index 25b01e156d82..e81f434760f4 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
@@ -153,8 +153,8 @@ s32 hid_sensor_read_poll_value(struct hid_sensor_common *st)
         int ret;
 
         ret = sensor_hub_get_feature(st->hsdev,
-                st->poll.report_id,
-                st->poll.index, &value);
+                                     st->poll.report_id,
+                                     st->poll.index, sizeof(value), &value);
 
         if (ret < 0 || value < 0) {
                 return -EINVAL;
@@ -174,8 +174,8 @@ int hid_sensor_read_samp_freq_value(struct hid_sensor_common *st,
         int ret;
 
         ret = sensor_hub_get_feature(st->hsdev,
-                st->poll.report_id,
-                st->poll.index, &value);
+                                     st->poll.report_id,
+                                     st->poll.index, sizeof(value), &value);
         if (ret < 0 || value < 0) {
                 *val1 = *val2 = 0;
                 return -EINVAL;
@@ -212,9 +212,8 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
                 else
                         value = 0;
         }
-        ret = sensor_hub_set_feature(st->hsdev,
-                st->poll.report_id,
-                st->poll.index, value);
+        ret = sensor_hub_set_feature(st->hsdev, st->poll.report_id,
+                                     st->poll.index, sizeof(value), &value);
         if (ret < 0 || value < 0)
                 ret = -EINVAL;
 
@@ -229,8 +228,9 @@ int hid_sensor_read_raw_hyst_value(struct hid_sensor_common *st,
         int ret;
 
         ret = sensor_hub_get_feature(st->hsdev,
-                st->sensitivity.report_id,
-                st->sensitivity.index, &value);
+                                     st->sensitivity.report_id,
+                                     st->sensitivity.index, sizeof(value),
+                                     &value);
         if (ret < 0 || value < 0) {
                 *val1 = *val2 = 0;
                 return -EINVAL;
@@ -253,9 +253,9 @@ int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
         value = convert_to_vtf_format(st->sensitivity.size,
                                 st->sensitivity.unit_expo,
                                 val1, val2);
-        ret = sensor_hub_set_feature(st->hsdev,
-                st->sensitivity.report_id,
-                st->sensitivity.index, value);
+        ret = sensor_hub_set_feature(st->hsdev, st->sensitivity.report_id,
+                                     st->sensitivity.index, sizeof(value),
+                                     &value);
         if (ret < 0 || value < 0)
                 ret = -EINVAL;
 
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
index 2f1d535b94c4..610fc98f88ef 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
@@ -68,20 +68,21 @@ static int _hid_sensor_power_state(struct hid_sensor_common *st, bool state)
         if (state_val >= 0) {
                 state_val += st->power_state.logical_minimum;
                 sensor_hub_set_feature(st->hsdev, st->power_state.report_id,
-                                        st->power_state.index,
-                                        (s32)state_val);
+                                       st->power_state.index, sizeof(state_val),
+                                       &state_val);
         }
 
         if (report_val >= 0) {
                 report_val += st->report_state.logical_minimum;
                 sensor_hub_set_feature(st->hsdev, st->report_state.report_id,
-                                        st->report_state.index,
-                                        (s32)report_val);
+                                       st->report_state.index,
+                                       sizeof(report_val),
+                                       &report_val);
         }
 
         sensor_hub_get_feature(st->hsdev, st->power_state.report_id,
-                                        st->power_state.index,
-                                        &state_val);
+                               st->power_state.index,
+                               sizeof(state_val), &state_val);
         if (state && poll_value)
                 msleep_interruptible(poll_value * 2);
 
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index a3c3e19de527..b5883b6f4e50 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -123,7 +123,8 @@ static int gyro_3d_read_raw(struct iio_dev *indio_dev,
                         *val = sensor_hub_input_attr_get_raw_value(
                                         gyro_state->common_attributes.hsdev,
                                         HID_USAGE_SENSOR_GYRO_3D, address,
-                                        report_id);
+                                        report_id,
+                                        SENSOR_HUB_SYNC);
                 else {
                         *val = 0;
                         hid_sensor_power_state(&gyro_state->common_attributes,
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 948acfc38b8c..1609ecdd01b0 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -101,7 +101,8 @@ static int als_read_raw(struct iio_dev *indio_dev,
                         *val = sensor_hub_input_attr_get_raw_value(
                                         als_state->common_attributes.hsdev,
                                         HID_USAGE_SENSOR_ALS, address,
-                                        report_id);
+                                        report_id,
+                                        SENSOR_HUB_SYNC);
                         hid_sensor_power_state(&als_state->common_attributes,
                                                 false);
                 } else {
diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c
index 3ecf79ed08ac..91ecc46ffeaa 100644
--- a/drivers/iio/light/hid-sensor-prox.c
+++ b/drivers/iio/light/hid-sensor-prox.c
@@ -96,7 +96,8 @@ static int prox_read_raw(struct iio_dev *indio_dev,
                         *val = sensor_hub_input_attr_get_raw_value(
                                 prox_state->common_attributes.hsdev,
                                 HID_USAGE_SENSOR_PROX, address,
-                                report_id);
+                                report_id,
+                                SENSOR_HUB_SYNC);
                         hid_sensor_power_state(&prox_state->common_attributes,
                                                 false);
                 } else {
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index d22993b4066a..4f9c0be24451 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -170,7 +170,8 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev,
                         *val = sensor_hub_input_attr_get_raw_value(
                                 magn_state->common_attributes.hsdev,
                                 HID_USAGE_SENSOR_COMPASS_3D, address,
-                                report_id);
+                                report_id,
+                                SENSOR_HUB_SYNC);
                 else {
                         *val = 0;
                         hid_sensor_power_state(&magn_state->common_attributes,
diff --git a/drivers/iio/orientation/hid-sensor-incl-3d.c b/drivers/iio/orientation/hid-sensor-incl-3d.c
index 73854460bb2c..5930fa32a2ab 100644
--- a/drivers/iio/orientation/hid-sensor-incl-3d.c
+++ b/drivers/iio/orientation/hid-sensor-incl-3d.c
@@ -124,7 +124,8 @@ static int incl_3d_read_raw(struct iio_dev *indio_dev,
                         *val = sensor_hub_input_attr_get_raw_value(
                                 incl_state->common_attributes.hsdev,
                                 HID_USAGE_SENSOR_INCLINOMETER_3D, address,
-                                report_id);
+                                report_id,
+                                SENSOR_HUB_SYNC);
                 else {
                         hid_sensor_power_state(&incl_state->common_attributes,
                                                 false);
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index 1af314926ebd..7bb8d4c1f7df 100644
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.c
@@ -100,7 +100,8 @@ static int press_read_raw(struct iio_dev *indio_dev,
                         *val = sensor_hub_input_attr_get_raw_value(
                                 press_state->common_attributes.hsdev,
                                 HID_USAGE_SENSOR_PRESSURE, address,
-                                report_id);
+                                report_id,
+                                SENSOR_HUB_SYNC);
                         hid_sensor_power_state(&press_state->common_attributes,
                                                 false);
                 } else {