| Message ID | 4cb0c4573cce165657ad1f7275c4b3852cbcd115.1648833416.git.christophe.leroy@csgroup.eu |
|---|---|
| State | Accepted |
| Commit | 95996a675757a0f3f75babb8cd4f2ebcd0bda478 |
| Headers | show |
| Series | cpufreq: Prepare cleanup of powerpc's asm/prom.h | expand |
On 01-04-22, 19:24, Christophe Leroy wrote: > powerpc's asm/prom.h brings some headers that it doesn't > need itself. > > In order to clean it up, first add missing headers in > users of asm/prom.h > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > drivers/cpufreq/pasemi-cpufreq.c | 1 - > drivers/cpufreq/pmac32-cpufreq.c | 2 +- > drivers/cpufreq/pmac64-cpufreq.c | 2 +- > drivers/cpufreq/ppc_cbe_cpufreq.c | 1 - > drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 2 +- > 5 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c > index 815645170c4d..039a66bbe1be 100644 > --- a/drivers/cpufreq/pasemi-cpufreq.c > +++ b/drivers/cpufreq/pasemi-cpufreq.c > @@ -18,7 +18,6 @@ > > #include <asm/hw_irq.h> > #include <asm/io.h> > -#include <asm/prom.h> > #include <asm/time.h> > #include <asm/smp.h> > > diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c > index 4f20c6a9108d..20f64a8b0a35 100644 > --- a/drivers/cpufreq/pmac32-cpufreq.c > +++ b/drivers/cpufreq/pmac32-cpufreq.c > @@ -24,7 +24,7 @@ > #include <linux/device.h> > #include <linux/hardirq.h> > #include <linux/of_device.h> > -#include <asm/prom.h> > + > #include <asm/machdep.h> > #include <asm/irq.h> > #include <asm/pmac_feature.h> > diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c > index d7542a106e6b..ba9c31d98bd6 100644 > --- a/drivers/cpufreq/pmac64-cpufreq.c > +++ b/drivers/cpufreq/pmac64-cpufreq.c > @@ -22,7 +22,7 @@ > #include <linux/completion.h> > #include <linux/mutex.h> > #include <linux/of_device.h> > -#include <asm/prom.h> > + > #include <asm/machdep.h> > #include <asm/irq.h> > #include <asm/sections.h> > diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c > index c58abb4cca3a..e3313ce63b38 100644 > --- a/drivers/cpufreq/ppc_cbe_cpufreq.c > +++ b/drivers/cpufreq/ppc_cbe_cpufreq.c > @@ -12,7 +12,6 @@ > #include <linux/of_platform.h> > > #include <asm/machdep.h> > -#include <asm/prom.h> > #include <asm/cell-regs.h> > > #include "ppc_cbe_cpufreq.h" > diff --git a/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c > index 037fe23bc6ed..4fba3637b115 100644 > --- a/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c > +++ b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c > @@ -13,9 +13,9 @@ > #include <linux/init.h> > #include <linux/of_platform.h> > #include <linux/pm_qos.h> > +#include <linux/slab.h> > > #include <asm/processor.h> > -#include <asm/prom.h> > #include <asm/pmi.h> > #include <asm/cell-regs.h> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On Mon, Apr 4, 2022 at 8:27 AM Viresh Kumar <viresh.kumar@linaro.org> wrote: > > On 01-04-22, 19:24, Christophe Leroy wrote: > > powerpc's asm/prom.h brings some headers that it doesn't > > need itself. > > > > In order to clean it up, first add missing headers in > > users of asm/prom.h > > > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> > > --- > > drivers/cpufreq/pasemi-cpufreq.c | 1 - > > drivers/cpufreq/pmac32-cpufreq.c | 2 +- > > drivers/cpufreq/pmac64-cpufreq.c | 2 +- > > drivers/cpufreq/ppc_cbe_cpufreq.c | 1 - > > drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 2 +- > > 5 files changed, 3 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c > > index 815645170c4d..039a66bbe1be 100644 > > --- a/drivers/cpufreq/pasemi-cpufreq.c > > +++ b/drivers/cpufreq/pasemi-cpufreq.c > > @@ -18,7 +18,6 @@ > > > > #include <asm/hw_irq.h> > > #include <asm/io.h> > > -#include <asm/prom.h> > > #include <asm/time.h> > > #include <asm/smp.h> > > > > diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c > > index 4f20c6a9108d..20f64a8b0a35 100644 > > --- a/drivers/cpufreq/pmac32-cpufreq.c > > +++ b/drivers/cpufreq/pmac32-cpufreq.c > > @@ -24,7 +24,7 @@ > > #include <linux/device.h> > > #include <linux/hardirq.h> > > #include <linux/of_device.h> > > -#include <asm/prom.h> > > + > > #include <asm/machdep.h> > > #include <asm/irq.h> > > #include <asm/pmac_feature.h> > > diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c > > index d7542a106e6b..ba9c31d98bd6 100644 > > --- a/drivers/cpufreq/pmac64-cpufreq.c > > +++ b/drivers/cpufreq/pmac64-cpufreq.c > > @@ -22,7 +22,7 @@ > > #include <linux/completion.h> > > #include <linux/mutex.h> > > #include <linux/of_device.h> > > -#include <asm/prom.h> > > + > > #include <asm/machdep.h> > > #include <asm/irq.h> > > #include <asm/sections.h> > > diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c > > index c58abb4cca3a..e3313ce63b38 100644 > > --- a/drivers/cpufreq/ppc_cbe_cpufreq.c > > +++ b/drivers/cpufreq/ppc_cbe_cpufreq.c > > @@ -12,7 +12,6 @@ > > #include <linux/of_platform.h> > > > > #include <asm/machdep.h> > > -#include <asm/prom.h> > > #include <asm/cell-regs.h> > > > > #include "ppc_cbe_cpufreq.h" > > diff --git a/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c > > index 037fe23bc6ed..4fba3637b115 100644 > > --- a/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c > > +++ b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c > > @@ -13,9 +13,9 @@ > > #include <linux/init.h> > > #include <linux/of_platform.h> > > #include <linux/pm_qos.h> > > +#include <linux/slab.h> > > > > #include <asm/processor.h> > > -#include <asm/prom.h> > > #include <asm/pmi.h> > > #include <asm/cell-regs.h> > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Applied as 5.19 material. If the powerpc folks decide to take it, I can drop it, so please let me know.
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c index 815645170c4d..039a66bbe1be 100644 --- a/drivers/cpufreq/pasemi-cpufreq.c +++ b/drivers/cpufreq/pasemi-cpufreq.c @@ -18,7 +18,6 @@ #include <asm/hw_irq.h> #include <asm/io.h> -#include <asm/prom.h> #include <asm/time.h> #include <asm/smp.h> diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c index 4f20c6a9108d..20f64a8b0a35 100644 --- a/drivers/cpufreq/pmac32-cpufreq.c +++ b/drivers/cpufreq/pmac32-cpufreq.c @@ -24,7 +24,7 @@ #include <linux/device.h> #include <linux/hardirq.h> #include <linux/of_device.h> -#include <asm/prom.h> + #include <asm/machdep.h> #include <asm/irq.h> #include <asm/pmac_feature.h> diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c index d7542a106e6b..ba9c31d98bd6 100644 --- a/drivers/cpufreq/pmac64-cpufreq.c +++ b/drivers/cpufreq/pmac64-cpufreq.c @@ -22,7 +22,7 @@ #include <linux/completion.h> #include <linux/mutex.h> #include <linux/of_device.h> -#include <asm/prom.h> + #include <asm/machdep.h> #include <asm/irq.h> #include <asm/sections.h> diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c index c58abb4cca3a..e3313ce63b38 100644 --- a/drivers/cpufreq/ppc_cbe_cpufreq.c +++ b/drivers/cpufreq/ppc_cbe_cpufreq.c @@ -12,7 +12,6 @@ #include <linux/of_platform.h> #include <asm/machdep.h> -#include <asm/prom.h> #include <asm/cell-regs.h> #include "ppc_cbe_cpufreq.h" diff --git a/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c index 037fe23bc6ed..4fba3637b115 100644 --- a/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c +++ b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c @@ -13,9 +13,9 @@ #include <linux/init.h> #include <linux/of_platform.h> #include <linux/pm_qos.h> +#include <linux/slab.h> #include <asm/processor.h> -#include <asm/prom.h> #include <asm/pmi.h> #include <asm/cell-regs.h>
powerpc's asm/prom.h brings some headers that it doesn't need itself. In order to clean it up, first add missing headers in users of asm/prom.h Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- drivers/cpufreq/pasemi-cpufreq.c | 1 - drivers/cpufreq/pmac32-cpufreq.c | 2 +- drivers/cpufreq/pmac64-cpufreq.c | 2 +- drivers/cpufreq/ppc_cbe_cpufreq.c | 1 - drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-)