| Message ID | 68d44009feb802c58b855ade3ac9109496b9d0e5.1648833426.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | video: fbdev: Prepare cleanup of powerpc's asm/prom.h | expand |
On 4/2/22 12:22, 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> applied to fbdev tree. Thanks! Helge > --- > drivers/video/fbdev/aty/aty128fb.c | 1 - > drivers/video/fbdev/aty/atyfb_base.c | 1 - > drivers/video/fbdev/aty/radeon_pm.c | 1 - > drivers/video/fbdev/aty/radeonfb.h | 2 +- > drivers/video/fbdev/controlfb.c | 3 --- > drivers/video/fbdev/matrox/matroxfb_base.h | 1 - > drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 2 ++ > drivers/video/fbdev/platinumfb.c | 2 +- > drivers/video/fbdev/valkyriefb.c | 3 +-- > 9 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c > index 6ff16d3132e5..b26c81233b6b 100644 > --- a/drivers/video/fbdev/aty/aty128fb.c > +++ b/drivers/video/fbdev/aty/aty128fb.c > @@ -68,7 +68,6 @@ > #ifdef CONFIG_PPC_PMAC > #include <asm/machdep.h> > #include <asm/pmac_feature.h> > -#include <asm/prom.h> > #include "../macmodes.h" > #endif > > diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c > index 1aef3d6ebd88..a3e6faed7745 100644 > --- a/drivers/video/fbdev/aty/atyfb_base.c > +++ b/drivers/video/fbdev/aty/atyfb_base.c > @@ -79,7 +79,6 @@ > > #ifdef __powerpc__ > #include <asm/machdep.h> > -#include <asm/prom.h> > #include "../macmodes.h" > #endif > #ifdef __sparc__ > diff --git a/drivers/video/fbdev/aty/radeon_pm.c b/drivers/video/fbdev/aty/radeon_pm.c > index b5fbd5329652..97a5972f5b1f 100644 > --- a/drivers/video/fbdev/aty/radeon_pm.c > +++ b/drivers/video/fbdev/aty/radeon_pm.c > @@ -22,7 +22,6 @@ > > #ifdef CONFIG_PPC_PMAC > #include <asm/machdep.h> > -#include <asm/prom.h> > #include <asm/pmac_feature.h> > #endif > > diff --git a/drivers/video/fbdev/aty/radeonfb.h b/drivers/video/fbdev/aty/radeonfb.h > index 93f403cbb415..91d81b576231 100644 > --- a/drivers/video/fbdev/aty/radeonfb.h > +++ b/drivers/video/fbdev/aty/radeonfb.h > @@ -21,7 +21,7 @@ > > #include <asm/io.h> > > -#if defined(CONFIG_PPC) || defined(CONFIG_SPARC) > +#ifdef CONFIG_SPARC > #include <asm/prom.h> > #endif > > diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c > index bd59e7b11ed5..aba46118b208 100644 > --- a/drivers/video/fbdev/controlfb.c > +++ b/drivers/video/fbdev/controlfb.c > @@ -47,9 +47,6 @@ > #include <linux/nvram.h> > #include <linux/adb.h> > #include <linux/cuda.h> > -#ifdef CONFIG_PPC_PMAC > -#include <asm/prom.h> > -#endif > #ifdef CONFIG_BOOTX_TEXT > #include <asm/btext.h> > #endif > diff --git a/drivers/video/fbdev/matrox/matroxfb_base.h b/drivers/video/fbdev/matrox/matroxfb_base.h > index 759dee996af1..958be6805f87 100644 > --- a/drivers/video/fbdev/matrox/matroxfb_base.h > +++ b/drivers/video/fbdev/matrox/matroxfb_base.h > @@ -47,7 +47,6 @@ > #include <asm/unaligned.h> > > #if defined(CONFIG_PPC_PMAC) > -#include <asm/prom.h> > #include "../macmodes.h" > #endif > > diff --git a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c > index 63721337a377..a7508f5be343 100644 > --- a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c > +++ b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c > @@ -18,6 +18,8 @@ > #include <linux/interrupt.h> > #include <linux/pci.h> > #if defined(CONFIG_OF) > +#include <linux/of_address.h> > +#include <linux/of_irq.h> > #include <linux/of_platform.h> > #endif > #include "mb862xxfb.h" > diff --git a/drivers/video/fbdev/platinumfb.c b/drivers/video/fbdev/platinumfb.c > index ce413a9df06e..5b9e26ea6449 100644 > --- a/drivers/video/fbdev/platinumfb.c > +++ b/drivers/video/fbdev/platinumfb.c > @@ -30,9 +30,9 @@ > #include <linux/fb.h> > #include <linux/init.h> > #include <linux/nvram.h> > +#include <linux/of_address.h> > #include <linux/of_device.h> > #include <linux/of_platform.h> > -#include <asm/prom.h> > > #include "macmodes.h" > #include "platinumfb.h" > diff --git a/drivers/video/fbdev/valkyriefb.c b/drivers/video/fbdev/valkyriefb.c > index 8425afe37d7c..a6c9d4f26669 100644 > --- a/drivers/video/fbdev/valkyriefb.c > +++ b/drivers/video/fbdev/valkyriefb.c > @@ -54,10 +54,9 @@ > #include <linux/nvram.h> > #include <linux/adb.h> > #include <linux/cuda.h> > +#include <linux/of_address.h> > #ifdef CONFIG_MAC > #include <asm/macintosh.h> > -#else > -#include <asm/prom.h> > #endif > > #include "macmodes.h"
diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c index 6ff16d3132e5..b26c81233b6b 100644 --- a/drivers/video/fbdev/aty/aty128fb.c +++ b/drivers/video/fbdev/aty/aty128fb.c @@ -68,7 +68,6 @@ #ifdef CONFIG_PPC_PMAC #include <asm/machdep.h> #include <asm/pmac_feature.h> -#include <asm/prom.h> #include "../macmodes.h" #endif diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c index 1aef3d6ebd88..a3e6faed7745 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -79,7 +79,6 @@ #ifdef __powerpc__ #include <asm/machdep.h> -#include <asm/prom.h> #include "../macmodes.h" #endif #ifdef __sparc__ diff --git a/drivers/video/fbdev/aty/radeon_pm.c b/drivers/video/fbdev/aty/radeon_pm.c index b5fbd5329652..97a5972f5b1f 100644 --- a/drivers/video/fbdev/aty/radeon_pm.c +++ b/drivers/video/fbdev/aty/radeon_pm.c @@ -22,7 +22,6 @@ #ifdef CONFIG_PPC_PMAC #include <asm/machdep.h> -#include <asm/prom.h> #include <asm/pmac_feature.h> #endif diff --git a/drivers/video/fbdev/aty/radeonfb.h b/drivers/video/fbdev/aty/radeonfb.h index 93f403cbb415..91d81b576231 100644 --- a/drivers/video/fbdev/aty/radeonfb.h +++ b/drivers/video/fbdev/aty/radeonfb.h @@ -21,7 +21,7 @@ #include <asm/io.h> -#if defined(CONFIG_PPC) || defined(CONFIG_SPARC) +#ifdef CONFIG_SPARC #include <asm/prom.h> #endif diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c index bd59e7b11ed5..aba46118b208 100644 --- a/drivers/video/fbdev/controlfb.c +++ b/drivers/video/fbdev/controlfb.c @@ -47,9 +47,6 @@ #include <linux/nvram.h> #include <linux/adb.h> #include <linux/cuda.h> -#ifdef CONFIG_PPC_PMAC -#include <asm/prom.h> -#endif #ifdef CONFIG_BOOTX_TEXT #include <asm/btext.h> #endif diff --git a/drivers/video/fbdev/matrox/matroxfb_base.h b/drivers/video/fbdev/matrox/matroxfb_base.h index 759dee996af1..958be6805f87 100644 --- a/drivers/video/fbdev/matrox/matroxfb_base.h +++ b/drivers/video/fbdev/matrox/matroxfb_base.h @@ -47,7 +47,6 @@ #include <asm/unaligned.h> #if defined(CONFIG_PPC_PMAC) -#include <asm/prom.h> #include "../macmodes.h" #endif diff --git a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c index 63721337a377..a7508f5be343 100644 --- a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c +++ b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c @@ -18,6 +18,8 @@ #include <linux/interrupt.h> #include <linux/pci.h> #if defined(CONFIG_OF) +#include <linux/of_address.h> +#include <linux/of_irq.h> #include <linux/of_platform.h> #endif #include "mb862xxfb.h" diff --git a/drivers/video/fbdev/platinumfb.c b/drivers/video/fbdev/platinumfb.c index ce413a9df06e..5b9e26ea6449 100644 --- a/drivers/video/fbdev/platinumfb.c +++ b/drivers/video/fbdev/platinumfb.c @@ -30,9 +30,9 @@ #include <linux/fb.h> #include <linux/init.h> #include <linux/nvram.h> +#include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_platform.h> -#include <asm/prom.h> #include "macmodes.h" #include "platinumfb.h" diff --git a/drivers/video/fbdev/valkyriefb.c b/drivers/video/fbdev/valkyriefb.c index 8425afe37d7c..a6c9d4f26669 100644 --- a/drivers/video/fbdev/valkyriefb.c +++ b/drivers/video/fbdev/valkyriefb.c @@ -54,10 +54,9 @@ #include <linux/nvram.h> #include <linux/adb.h> #include <linux/cuda.h> +#include <linux/of_address.h> #ifdef CONFIG_MAC #include <asm/macintosh.h> -#else -#include <asm/prom.h> #endif #include "macmodes.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/video/fbdev/aty/aty128fb.c | 1 - drivers/video/fbdev/aty/atyfb_base.c | 1 - drivers/video/fbdev/aty/radeon_pm.c | 1 - drivers/video/fbdev/aty/radeonfb.h | 2 +- drivers/video/fbdev/controlfb.c | 3 --- drivers/video/fbdev/matrox/matroxfb_base.h | 1 - drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 2 ++ drivers/video/fbdev/platinumfb.c | 2 +- drivers/video/fbdev/valkyriefb.c | 3 +-- 9 files changed, 5 insertions(+), 11 deletions(-)