| Message ID | 20230329-dt-cpu-header-cleanups-v1-16-581e2605fe47@kernel.org |
|---|---|
| State | Accepted |
| Commit | 24760e43c6a6164a33c023eed7536073bf6c68f7 |
| Headers | show |
| Series | DT header disentangling, part 1 | expand |
On Wed, Mar 29, 2023 at 5:52 PM Rob Herring <robh@kernel.org> wrote: > > 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. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > Please ack and I will take the series via the DT tree. Acked-by: Rafael J. Wysocki <rafael@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 6de027f9f6f5..bf68920d038a 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 c6e2e91bb4c3..1fc9968eae19 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 be383f4b6855..ae0b838a0634 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 02aa0b39af9d..12fec92a85fd 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.39.2 >
On Wed, Mar 29, 2023 at 10:52:13AM -0500, Rob Herring wrote: > 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. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > Please ack and I will take the series via the DT tree. > --- > 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 6de027f9f6f5..bf68920d038a 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> Acked-by: Sudeep Holla <sudeep.holla@arm.com>
On Wed, Mar 29, 2023 at 9:22 PM Rob Herring <robh@kernel.org> wrote: > > 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. > > Signed-off-by: Rob Herring <robh@kernel.org> For cpuidle-riscv-sbi.c Acked-by: Anup Patel <anup@brainfault.org> Regards, Anup > --- > Please ack and I will take the series via the DT tree. > --- > 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 6de027f9f6f5..bf68920d038a 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 c6e2e91bb4c3..1fc9968eae19 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 be383f4b6855..ae0b838a0634 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 02aa0b39af9d..12fec92a85fd 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.39.2 >
diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c index 6de027f9f6f5..bf68920d038a 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 c6e2e91bb4c3..1fc9968eae19 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 be383f4b6855..ae0b838a0634 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 02aa0b39af9d..12fec92a85fd 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"
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. Signed-off-by: Rob Herring <robh@kernel.org> --- Please ack and I will take the series via the DT tree. --- 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(-)