drop i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch from...

diff --git a/queue-4.19/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch b/queue-4.19/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch
deleted file mode 100644 (file)
index bc004ca..0000000
--- a/queue-4.19/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 845b89127bc5458d0152a4d63f165c62a22fcb70 Mon Sep 17 00:00:00 2001
-From: Jean Delvare <jdelvare@suse.de>
-Date: Thu, 10 Sep 2020 11:57:08 +0200
-Subject: i2c: i801: Exclude device from suspend direct complete optimization
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jean Delvare <jdelvare@suse.de>
-
-commit 845b89127bc5458d0152a4d63f165c62a22fcb70 upstream.
-
-By default, PCI drivers with runtime PM enabled will skip the calls
-to suspend and resume on system PM. For this driver, we don't want
-that, as we need to perform additional steps for system PM to work
-properly on all systems. So instruct the PM core to not skip these
-calls.
-
-Fixes: a9c8088c7988 ("i2c: i801: Don't restore config registers on runtime PM")
-Reported-by: Volker Rümelin <volker.ruemelin@googlemail.com>
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Wolfram Sang <wsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/i2c/busses/i2c-i801.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/i2c/busses/i2c-i801.c
-+++ b/drivers/i2c/busses/i2c-i801.c
-@@ -1698,6 +1698,7 @@ static int i801_probe(struct pci_dev *de
- 
-       pci_set_drvdata(dev, priv);
- 
-+      dev_pm_set_driver_flags(&dev->dev, DPM_FLAG_NO_DIRECT_COMPLETE);
-       pm_runtime_set_autosuspend_delay(&dev->dev, 1000);
-       pm_runtime_use_autosuspend(&dev->dev);
-       pm_runtime_put_autosuspend(&dev->dev);

diff --git a/queue-4.19/series b/queue-4.19/series
index 61f894d3c84010f549c6217e8dd7137c4cdf15e4..b15ff0ddffcf92d6490522250ad0acb3d59134bc 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -7,7 +7,6 @@ vsock-virtio-use-rcu-to-avoid-use-after-free-on-the_.patch
 vsock-virtio-stop-workers-during-the-.remove.patch
 vsock-virtio-add-transport-parameter-to-the-virtio_t.patch
 net-virtio_vsock-enhance-connection-semantics.patch
-i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch
 input-i8042-add-nopnp-quirk-for-acer-aspire-5-a515.patch
 ftrace-move-rcu-is-watching-check-after-recursion-check.patch
 drm-amdgpu-restore-proper-ref-count-in-amdgpu_display_crtc_set_config.patch

diff --git a/queue-5.4/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch b/queue-5.4/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch
deleted file mode 100644 (file)
index e790690..0000000
--- a/queue-5.4/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 845b89127bc5458d0152a4d63f165c62a22fcb70 Mon Sep 17 00:00:00 2001
-From: Jean Delvare <jdelvare@suse.de>
-Date: Thu, 10 Sep 2020 11:57:08 +0200
-Subject: i2c: i801: Exclude device from suspend direct complete optimization
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jean Delvare <jdelvare@suse.de>
-
-commit 845b89127bc5458d0152a4d63f165c62a22fcb70 upstream.
-
-By default, PCI drivers with runtime PM enabled will skip the calls
-to suspend and resume on system PM. For this driver, we don't want
-that, as we need to perform additional steps for system PM to work
-properly on all systems. So instruct the PM core to not skip these
-calls.
-
-Fixes: a9c8088c7988 ("i2c: i801: Don't restore config registers on runtime PM")
-Reported-by: Volker Rümelin <volker.ruemelin@googlemail.com>
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Wolfram Sang <wsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/i2c/busses/i2c-i801.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/i2c/busses/i2c-i801.c
-+++ b/drivers/i2c/busses/i2c-i801.c
-@@ -1891,6 +1891,7 @@ static int i801_probe(struct pci_dev *de
- 
-       pci_set_drvdata(dev, priv);
- 
-+      dev_pm_set_driver_flags(&dev->dev, DPM_FLAG_NO_DIRECT_COMPLETE);
-       pm_runtime_set_autosuspend_delay(&dev->dev, 1000);
-       pm_runtime_use_autosuspend(&dev->dev);
-       pm_runtime_put_autosuspend(&dev->dev);

diff --git a/queue-5.4/series b/queue-5.4/series
index 420e5497cb5dfaefe8913f929c62fc8081514a13..0f78bded6b9b00744ccee8270fcc854891db46e7 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -8,7 +8,6 @@ clk-socfpga-stratix10-fix-the-divider-for-the-emac_ptp_free_clk.patch
 vsock-virtio-add-transport-parameter-to-the-virtio_t.patch
 net-virtio_vsock-enhance-connection-semantics.patch
 xfs-trim-io-to-found-cow-extent-limit.patch
-i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch
 input-i8042-add-nopnp-quirk-for-acer-aspire-5-a515.patch
 iio-adc-qcom-spmi-adc5-fix-driver-name.patch
 ftrace-move-rcu-is-watching-check-after-recursion-check.patch