| Message ID | 79201f5fae8d003164ac36ed3be7789db1bc5ab4.1648833421.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b2851926c6d9d977ff60f613aff95f4900b9620e |
| Headers | show |
| Series | pci: hotplug: Prepare cleanup of powerpc's asm/prom.h | expand |
On Sat, Apr 02, 2022 at 12:11:56PM +0200, 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> I tidied the subject line to match previous history and applied to pci/hotplug for v5.19, thanks! > --- > drivers/pci/hotplug/pnv_php.c | 1 + > drivers/pci/hotplug/rpadlpar_core.c | 1 + > drivers/pci/hotplug/rpaphp_core.c | 2 ++ > drivers/pci/hotplug/rpaphp_pci.c | 1 + > drivers/pci/hotplug/rpaphp_slot.c | 1 + > 5 files changed, 6 insertions(+) > > diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c > index f4c2e6e01be0..881d420637bf 100644 > --- a/drivers/pci/hotplug/pnv_php.c > +++ b/drivers/pci/hotplug/pnv_php.c > @@ -9,6 +9,7 @@ > #include <linux/module.h> > #include <linux/pci.h> > #include <linux/pci_hotplug.h> > +#include <linux/of_fdt.h> > > #include <asm/opal.h> > #include <asm/pnv-pci.h> > diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c > index e6991ff67526..980bb3afd092 100644 > --- a/drivers/pci/hotplug/rpadlpar_core.c > +++ b/drivers/pci/hotplug/rpadlpar_core.c > @@ -15,6 +15,7 @@ > > #include <linux/init.h> > #include <linux/module.h> > +#include <linux/of.h> > #include <linux/pci.h> > #include <linux/string.h> > #include <linux/vmalloc.h> > diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c > index 9887c9de08c3..491986197c47 100644 > --- a/drivers/pci/hotplug/rpaphp_core.c > +++ b/drivers/pci/hotplug/rpaphp_core.c > @@ -11,6 +11,7 @@ > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/moduleparam.h> > +#include <linux/of.h> > #include <linux/pci.h> > #include <linux/pci_hotplug.h> > #include <linux/smp.h> > @@ -20,6 +21,7 @@ > #include <asm/eeh.h> /* for eeh_add_device() */ > #include <asm/rtas.h> /* rtas_call */ > #include <asm/pci-bridge.h> /* for pci_controller */ > +#include <asm/prom.h> > #include "../pci.h" /* for pci_add_new_bus */ > /* and pci_do_scan_bus */ > #include "rpaphp.h" > diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c > index c380bdacd146..630f77057c23 100644 > --- a/drivers/pci/hotplug/rpaphp_pci.c > +++ b/drivers/pci/hotplug/rpaphp_pci.c > @@ -8,6 +8,7 @@ > * Send feedback to <lxie@us.ibm.com> > * > */ > +#include <linux/of.h> > #include <linux/pci.h> > #include <linux/string.h> > > diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c > index 93b4a945c55d..779eab12e981 100644 > --- a/drivers/pci/hotplug/rpaphp_slot.c > +++ b/drivers/pci/hotplug/rpaphp_slot.c > @@ -11,6 +11,7 @@ > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/sysfs.h> > +#include <linux/of.h> > #include <linux/pci.h> > #include <linux/string.h> > #include <linux/slab.h> > -- > 2.35.1 >
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c index f4c2e6e01be0..881d420637bf 100644 --- a/drivers/pci/hotplug/pnv_php.c +++ b/drivers/pci/hotplug/pnv_php.c @@ -9,6 +9,7 @@ #include <linux/module.h> #include <linux/pci.h> #include <linux/pci_hotplug.h> +#include <linux/of_fdt.h> #include <asm/opal.h> #include <asm/pnv-pci.h> diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index e6991ff67526..980bb3afd092 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c @@ -15,6 +15,7 @@ #include <linux/init.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/pci.h> #include <linux/string.h> #include <linux/vmalloc.h> diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index 9887c9de08c3..491986197c47 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/of.h> #include <linux/pci.h> #include <linux/pci_hotplug.h> #include <linux/smp.h> @@ -20,6 +21,7 @@ #include <asm/eeh.h> /* for eeh_add_device() */ #include <asm/rtas.h> /* rtas_call */ #include <asm/pci-bridge.h> /* for pci_controller */ +#include <asm/prom.h> #include "../pci.h" /* for pci_add_new_bus */ /* and pci_do_scan_bus */ #include "rpaphp.h" diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c index c380bdacd146..630f77057c23 100644 --- a/drivers/pci/hotplug/rpaphp_pci.c +++ b/drivers/pci/hotplug/rpaphp_pci.c @@ -8,6 +8,7 @@ * Send feedback to <lxie@us.ibm.com> * */ +#include <linux/of.h> #include <linux/pci.h> #include <linux/string.h> diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c index 93b4a945c55d..779eab12e981 100644 --- a/drivers/pci/hotplug/rpaphp_slot.c +++ b/drivers/pci/hotplug/rpaphp_slot.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/sysfs.h> +#include <linux/of.h> #include <linux/pci.h> #include <linux/string.h> #include <linux/slab.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/pci/hotplug/pnv_php.c | 1 + drivers/pci/hotplug/rpadlpar_core.c | 1 + drivers/pci/hotplug/rpaphp_core.c | 2 ++ drivers/pci/hotplug/rpaphp_pci.c | 1 + drivers/pci/hotplug/rpaphp_slot.c | 1 + 5 files changed, 6 insertions(+)