drop devfreq patch from 4.9 and 4.14.

diff --git a/queue-4.14/pm-devfreq-use-put_device-instead-of-kfree.patch b/queue-4.14/pm-devfreq-use-put_device-instead-of-kfree.patch
deleted file mode 100644 (file)
index 10d6e1e..0000000
--- a/queue-4.14/pm-devfreq-use-put_device-instead-of-kfree.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From foo@baz Mon Sep 24 09:35:12 CEST 2018
-From: Arvind Yadav <arvind.yadav.cs@gmail.com>
-Date: Fri, 30 Mar 2018 17:14:03 +0530
-Subject: PM / devfreq: use put_device() instead of kfree()
-
-From: Arvind Yadav <arvind.yadav.cs@gmail.com>
-
-[ Upstream commit 2d803dc8f7a5f622ac47c3b650834ada3a2659b9 ]
-
-Never directly free @dev after calling device_register() or
-device_unregister(), even if device_register() returned an error.
-Always use put_device() to give up the reference initialized.
-
-Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
-Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
-Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/devfreq/devfreq.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/devfreq/devfreq.c
-+++ b/drivers/devfreq/devfreq.c
-@@ -564,7 +564,8 @@ struct devfreq *devfreq_add_device(struc
-       err = device_register(&devfreq->dev);
-       if (err) {
-               mutex_unlock(&devfreq->lock);
--              goto err_dev;
-+              put_device(&devfreq->dev);
-+              goto err_out;
-       }
- 
-       devfreq->trans_table =  devm_kzalloc(&devfreq->dev,
-@@ -610,6 +611,7 @@ err_init:
-       mutex_unlock(&devfreq_list_lock);
- 
-       device_unregister(&devfreq->dev);
-+      devfreq = NULL;
- err_dev:
-       if (devfreq)
-               kfree(devfreq);

diff --git a/queue-4.14/series b/queue-4.14/series
index f5c2a31f79df8d7d026d0d1d91c222ac44d98dde..6d52d4c06496221417df4108762686158a7e5715 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -114,7 +114,6 @@ bluetooth-use-lock_sock_nested-in-bt_accept_enqueue.patch
 evm-don-t-deadlock-if-a-crypto-algorithm-is-unavailable.patch
 kvm-ppc-book3s-hv-add-of_node_put-in-success-path.patch
 security-check-for-kstrdup-failure-in-lsm_append.patch
-pm-devfreq-use-put_device-instead-of-kfree.patch
 mips-loongson64-cs5536-fix-pci_ohci_int_reg-reads.patch
 configfs-fix-registered-group-removal.patch
 pinctrl-rza1-fix-selector-use-for-groups-and-functions.patch

diff --git a/queue-4.9/pm-devfreq-use-put_device-instead-of-kfree.patch b/queue-4.9/pm-devfreq-use-put_device-instead-of-kfree.patch
deleted file mode 100644 (file)
index 2407b04..0000000
--- a/queue-4.9/pm-devfreq-use-put_device-instead-of-kfree.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From foo@baz Mon Sep 24 09:32:39 CEST 2018
-From: Arvind Yadav <arvind.yadav.cs@gmail.com>
-Date: Fri, 30 Mar 2018 17:14:03 +0530
-Subject: PM / devfreq: use put_device() instead of kfree()
-
-From: Arvind Yadav <arvind.yadav.cs@gmail.com>
-
-[ Upstream commit 2d803dc8f7a5f622ac47c3b650834ada3a2659b9 ]
-
-Never directly free @dev after calling device_register() or
-device_unregister(), even if device_register() returned an error.
-Always use put_device() to give up the reference initialized.
-
-Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
-Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
-Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/devfreq/devfreq.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/devfreq/devfreq.c
-+++ b/drivers/devfreq/devfreq.c
-@@ -574,7 +574,8 @@ struct devfreq *devfreq_add_device(struc
-       err = device_register(&devfreq->dev);
-       if (err) {
-               mutex_unlock(&devfreq->lock);
--              goto err_dev;
-+              put_device(&devfreq->dev);
-+              goto err_out;
-       }
- 
-       devfreq->trans_table =  devm_kzalloc(&devfreq->dev, sizeof(unsigned int) *
-@@ -618,6 +619,7 @@ err_init:
-       mutex_unlock(&devfreq_list_lock);
- 
-       device_unregister(&devfreq->dev);
-+      devfreq = NULL;
- err_dev:
-       if (devfreq)
-               kfree(devfreq);

diff --git a/queue-4.9/series b/queue-4.9/series
index 7428023069e713f3557356e9e50299eb0cd5c222..7f569f3f6eedd4088b2ab7dfa4b7c45582eb331b 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -74,7 +74,6 @@ binfmt_elf-respect-error-return-from-regset-active.patch
 audit-fix-use-after-free-in-audit_add_watch.patch
 mtdchar-fix-overflows-in-adjustment-of-count.patch
 evm-don-t-deadlock-if-a-crypto-algorithm-is-unavailable.patch
-pm-devfreq-use-put_device-instead-of-kfree.patch
 mips-loongson64-cs5536-fix-pci_ohci_int_reg-reads.patch
 configfs-fix-registered-group-removal.patch
 efi-esrt-only-call-efi_mem_reserve-for-boot-services-memory.patch