Drop input-elan_i2c-only-increment-wakeup-count-on-touch.patch from 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/input-elan_i2c-only-increment-wakeup-count-on-touch.patch b/queue-4.19/input-elan_i2c-only-increment-wakeup-count-on-touch.patch
deleted file mode 100644 (file)
index a2df61d..0000000
--- a/queue-4.19/input-elan_i2c-only-increment-wakeup-count-on-touch.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e1b041c198f632208f5cca5b56fff2c72facfd55 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 6 Jul 2020 17:39:41 -0700
-Subject: Input: elan_i2c - only increment wakeup count on touch
-
-From: Derek Basehore <dbasehore@chromium.org>
-
-[ Upstream commit 966334dfc472bdfa67bed864842943b19755d192 ]
-
-This moves the wakeup increment for elan devices to the touch report.
-This prevents the drivers from incorrectly reporting a wakeup when the
-resume callback resets then device, which causes an interrupt to
-occur.
-
-Signed-off-by: Derek Basehore <dbasehore@chromium.org>
-Link: https://lore.kernel.org/r/20200706235046.1984283-1-dbasehore@chromium.org
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/input/mouse/elan_i2c_core.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
-index ae012639ae1d5..82afaca2e1a67 100644
---- a/drivers/input/mouse/elan_i2c_core.c
-+++ b/drivers/input/mouse/elan_i2c_core.c
-@@ -917,6 +917,8 @@ static void elan_report_absolute(struct elan_tp_data *data, u8 *packet)
-       u8 hover_info = packet[ETP_HOVER_INFO_OFFSET];
-       bool contact_valid, hover_event;
- 
-+      pm_wakeup_event(&data->client->dev, 0);
-+
-       hover_event = hover_info & 0x40;
-       for (i = 0; i < ETP_MAX_FINGERS; i++) {
-               contact_valid = tp_info & (1U << (3 + i));
-@@ -939,6 +941,8 @@ static void elan_report_trackpoint(struct elan_tp_data *data, u8 *report)
-       u8 *packet = &report[ETP_REPORT_ID_OFFSET + 1];
-       int x, y;
- 
-+      pm_wakeup_event(&data->client->dev, 0);
-+
-       if (!data->tp_input) {
-               dev_warn_once(&data->client->dev,
-                             "received a trackpoint report while no trackpoint device has been created. Please report upstream.\n");
-@@ -963,7 +967,6 @@ static void elan_report_trackpoint(struct elan_tp_data *data, u8 *report)
- static irqreturn_t elan_isr(int irq, void *dev_id)
- {
-       struct elan_tp_data *data = dev_id;
--      struct device *dev = &data->client->dev;
-       int error;
-       u8 report[ETP_MAX_REPORT_LEN];
- 
-@@ -989,7 +992,7 @@ static irqreturn_t elan_isr(int irq, void *dev_id)
-               elan_report_trackpoint(data, report);
-               break;
-       default:
--              dev_err(dev, "invalid report id data (%x)\n",
-+              dev_err(&data->client->dev, "invalid report id data (%x)\n",
-                       report[ETP_REPORT_ID_OFFSET]);
-       }
- 
--- 
-2.25.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 59783077fd29050601b5eb897e1fd43ddf992ea3..b7d6895d67c54ff066dbda2d7a52d13fb5bef07b 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -51,7 +51,6 @@ regmap-dev_get_regmap_match-fix-string-comparison.patch
 hwmon-aspeed-pwm-tacho-avoid-possible-buffer-overflo.patch
 dmaengine-ioat-setting-ioat-timeout-as-module-parame.patch
 input-synaptics-enable-intertouch-for-thinkpad-x1e-1.patch
-input-elan_i2c-only-increment-wakeup-count-on-touch.patch
 usb-gadget-udc-gr_udc-fix-memleak-on-error-handling-.patch
 hwmon-adm1275-make-sure-we-are-reading-enough-data-f.patch
 hwmon-scmi-fix-potential-buffer-overflow-in-scmi_hwm.patch