These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / mouse / cyapa_gen3.c

diff --git a/kernel/drivers/input/mouse/cyapa_gen3.c b/kernel/drivers/input/mouse/cyapa_gen3.c
index 1e2291c..1a9d12a 100644 (file)
--- a/kernel/drivers/input/mouse/cyapa_gen3.c
+++ b/kernel/drivers/input/mouse/cyapa_gen3.c
@@ -6,7 +6,7 @@
  *   Daniel Kurtz <djkurtz@chromium.org>
  *   Benson Leung <bleung@chromium.org>
  *
- * Copyright (C) 2011-2014 Cypress Semiconductor, Inc.
+ * Copyright (C) 2011-2015 Cypress Semiconductor, Inc.
  * Copyright (C) 2011-2012 Google, Inc.
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -950,14 +950,13 @@ static u16 cyapa_get_wait_time_for_pwr_cmd(u8 pwr_mode)
  * Device power mode can only be set when device is in operational mode.
  */
 static int cyapa_gen3_set_power_mode(struct cyapa *cyapa, u8 power_mode,
-               u16 always_unused)
+               u16 always_unused, bool is_suspend_unused)
 {
        int ret;
        u8 power;
        int tries;
        u16 sleep_time;
 
-       always_unused = 0;
        if (cyapa->state != CYAPA_STATE_OP)
                return 0;
 
@@ -1000,6 +999,11 @@ static int cyapa_gen3_set_power_mode(struct cyapa *cyapa, u8 power_mode,
        return ret;
 }
 
+static int cyapa_gen3_set_proximity(struct cyapa *cyapa, bool enable)
+{
+       return -EOPNOTSUPP;
+}
+
 static int cyapa_gen3_get_query_data(struct cyapa *cyapa)
 {
        u8 query_data[QUERY_DATA_SIZE];
@@ -1108,7 +1112,7 @@ static int cyapa_gen3_do_operational_check(struct cyapa *cyapa)
                 * may cause problems, so we set the power mode first here.
                 */
                error = cyapa_gen3_set_power_mode(cyapa,
-                               PWR_MODE_FULL_ACTIVE, 0);
+                               PWR_MODE_FULL_ACTIVE, 0, false);
                if (error)
                        dev_err(dev, "%s: set full power mode failed: %d\n",
                                __func__, error);
@@ -1157,7 +1161,7 @@ static bool cyapa_gen3_irq_cmd_handler(struct cyapa *cyapa)
         * so, stop cyapa_gen3_irq_handler to continue process to
         * avoid unwanted to error detecting and processing.
         *
-        * And also, avoid the periodicly accerted interrupts to be processed
+        * And also, avoid the periodically asserted interrupts to be processed
         * as touch inputs when gen3 failed to launch into application mode,
         * which will cause gen3 stays in bootloader mode.
         */
@@ -1244,4 +1248,6 @@ const struct cyapa_dev_ops cyapa_gen3_ops = {
        .irq_cmd_handler = cyapa_gen3_irq_cmd_handler,
        .sort_empty_output_data = cyapa_gen3_empty_output_data,
        .set_power_mode = cyapa_gen3_set_power_mode,
+
+       .set_proximity = cyapa_gen3_set_proximity,
 };