Drop cpuidle-adjust-includes-to-remove-of_device.h.patch

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

diff --git a/queue-6.1/cpuidle-adjust-includes-to-remove-of_device.h.patch b/queue-6.1/cpuidle-adjust-includes-to-remove-of_device.h.patch
deleted file mode 100644 (file)
index 44bb868..0000000
--- a/queue-6.1/cpuidle-adjust-includes-to-remove-of_device.h.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 03282e65d6bcd847a6b22651f99d263f5ffda59e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 29 Mar 2023 10:52:13 -0500
-Subject: cpuidle: Adjust includes to remove of_device.h
-
-From: Rob Herring <robh@kernel.org>
-
-[ Upstream commit 24760e43c6a6164a33c023eed7536073bf6c68f7 ]
-
-Now that of_cpu_device_node_get() is defined in of.h, of_device.h is just
-implicitly including other includes, and is no longer needed. Adjust the
-include files with what was implicitly included by of_device.h (cpu.h,
-cpuhotplug.h, of.h, and of_platform.h) and drop including of_device.h.
-
-Acked-by: Anup Patel <anup@brainfault.org>
-Acked-by: Rafael J. Wysocki <rafael@kernel.org>
-Acked-by: Sudeep Holla <sudeep.holla@arm.com>
-Link: https://lore.kernel.org/r/20230329-dt-cpu-header-cleanups-v1-16-581e2605fe47@kernel.org
-Signed-off-by: Rob Herring <robh@kernel.org>
-Stable-dep-of: a309320ddbac ("cpuidle: riscv-sbi: Use scoped device node handling to fix missing of_node_put")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpuidle/cpuidle-psci.c      | 1 -
- drivers/cpuidle/cpuidle-qcom-spm.c  | 3 +--
- drivers/cpuidle/cpuidle-riscv-sbi.c | 2 +-
- drivers/cpuidle/dt_idle_states.c    | 1 -
- 4 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c
-index 57bc3e3ae3912..9a55b0d090b02 100644
---- a/drivers/cpuidle/cpuidle-psci.c
-+++ b/drivers/cpuidle/cpuidle-psci.c
-@@ -16,7 +16,6 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/of.h>
--#include <linux/of_device.h>
- #include <linux/platform_device.h>
- #include <linux/psci.h>
- #include <linux/pm_domain.h>
-diff --git a/drivers/cpuidle/cpuidle-qcom-spm.c b/drivers/cpuidle/cpuidle-qcom-spm.c
-index beedf22cbe78b..5dcfc7efe1611 100644
---- a/drivers/cpuidle/cpuidle-qcom-spm.c
-+++ b/drivers/cpuidle/cpuidle-qcom-spm.c
-@@ -11,8 +11,7 @@
- #include <linux/io.h>
- #include <linux/slab.h>
- #include <linux/of.h>
--#include <linux/of_address.h>
--#include <linux/of_device.h>
-+#include <linux/of_platform.h>
- #include <linux/err.h>
- #include <linux/platform_device.h>
- #include <linux/cpuidle.h>
-diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c
-index af7320a768d27..8a185116b82ee 100644
---- a/drivers/cpuidle/cpuidle-riscv-sbi.c
-+++ b/drivers/cpuidle/cpuidle-riscv-sbi.c
-@@ -8,6 +8,7 @@
- 
- #define pr_fmt(fmt) "cpuidle-riscv-sbi: " fmt
- 
-+#include <linux/cpuhotplug.h>
- #include <linux/cpuidle.h>
- #include <linux/cpumask.h>
- #include <linux/cpu_pm.h>
-@@ -15,7 +16,6 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/of.h>
--#include <linux/of_device.h>
- #include <linux/slab.h>
- #include <linux/platform_device.h>
- #include <linux/pm_domain.h>
-diff --git a/drivers/cpuidle/dt_idle_states.c b/drivers/cpuidle/dt_idle_states.c
-index 448bc796b0b40..2c3559c944dbf 100644
---- a/drivers/cpuidle/dt_idle_states.c
-+++ b/drivers/cpuidle/dt_idle_states.c
-@@ -14,7 +14,6 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/of.h>
--#include <linux/of_device.h>
- 
- #include "dt_idle_states.h"
- 
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index f4cc6deb186dc317a096083f35365ae1a774d3e0..2e2ed93275cb7151cdbb69460c31afd48752d030 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -359,7 +359,6 @@ pps-remove-usage-of-the-deprecated-ida_simple_xx-api.patch
 pps-add-an-error-check-in-parport_attach.patch
 x86-idtentry-incorporate-definitions-declarations-of.patch
 x86-entry-remove-unwanted-instrumentation-in-common_.patch
-cpuidle-adjust-includes-to-remove-of_device.h.patch
 mm-filemap-return-early-if-failed-to-allocate-memory-for-split.patch
 lib-xarray-introduce-a-new-helper-xas_get_order.patch
 mm-filemap-optimize-filemap-folio-adding.patch