Commit 6bff3ffc authored by Christophe Leroy's avatar Christophe Leroy Committed by Jakub Kicinski

net: ethernet: Prepare cleanup of powerpc's asm/prom.h

powerpc's asm/prom.h includes some headers that it doesn't
need itself.

In order to clean powerpc's asm/prom.h up in a further step,
first clean all files that include asm/prom.h

Some files don't need asm/prom.h at all. For those ones,
just remove inclusion of asm/prom.h

Some files don't need any of the items provided by asm/prom.h,
but need some of the headers included by asm/prom.h. For those
ones, add the needed headers that are brought by asm/prom.h at
the moment and remove asm/prom.h

Some files really need asm/prom.h but also need some of the
headers included by asm/prom.h. For those one, leave asm/prom.h
but also add the needed headers so that they can be removed
from asm/prom.h in a later step.
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/09a13d592d628de95d30943e59b2170af5b48110.1651663857.git.christophe.leroy@csgroup.euSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d9ccf770
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pgtable.h> #include <linux/pgtable.h>
#include <asm/prom.h>
#include <asm/dbdma.h> #include <asm/dbdma.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/page.h> #include <asm/page.h>
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/bitrev.h> #include <linux/bitrev.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pgtable.h> #include <linux/pgtable.h>
#include <asm/prom.h>
#include <asm/dbdma.h> #include <asm/dbdma.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/macio.h> #include <asm/macio.h>
......
...@@ -29,7 +29,9 @@ ...@@ -29,7 +29,9 @@
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/of_address.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <linux/of_net.h> #include <linux/of_net.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of_address.h>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mpc52xx.h> #include <asm/mpc52xx.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/platform_device.h>
#include <asm/ibmebus.h> #include <asm/ibmebus.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include <asm/kexec.h> #include <asm/kexec.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <net/ip.h> #include <net/ip.h>
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/irqdomain.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#endif #endif
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
#include <asm/prom.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/pmac_feature.h> #include <asm/pmac_feature.h>
#endif #endif
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/of.h>
#include <net/checksum.h> #include <net/checksum.h>
#include "spider_net.h" #include "spider_net.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment