Skip to content

Commit 3d40aed

Browse files
robherringkuba-moo
authored andcommitted
net: Explicitly include correct DT includes
The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Acked-by: Alex Elder <elder@linaro.org> Reviewed-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> Reviewed-by: Wei Fang <wei.fang@nxp.com> Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Simon Horman <simon.horman@corigine.com> Link: https://lore.kernel.org/r/20230727014944.3972546-1-robh@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 81b04a8 commit 3d40aed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+88
-92
lines changed

drivers/net/ethernet/aeroflex/greth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include <linux/io.h>
3030
#include <linux/crc32.h>
3131
#include <linux/mii.h>
32-
#include <linux/of_device.h>
32+
#include <linux/of.h>
3333
#include <linux/of_net.h>
34-
#include <linux/of_platform.h>
34+
#include <linux/platform_device.h>
3535
#include <linux/slab.h>
3636
#include <asm/cacheflush.h>
3737
#include <asm/byteorder.h>

drivers/net/ethernet/amd/sunlance.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static char lancestr[] = "LANCE";
9292
#include <linux/bitops.h>
9393
#include <linux/dma-mapping.h>
9494
#include <linux/of.h>
95-
#include <linux/of_device.h>
95+
#include <linux/platform_device.h>
9696
#include <linux/gfp.h>
9797
#include <linux/pgtable.h>
9898

drivers/net/ethernet/apm/xgene-v2/main.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <linux/of_mdio.h>
2323
#include <linux/prefetch.h>
2424
#include <linux/phy.h>
25+
#include <linux/platform_device.h>
2526
#include <net/ip.h>
2627
#include "mac.h"
2728
#include "enet.h"

drivers/net/ethernet/arc/emac_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#include <linux/interrupt.h>
1616
#include <linux/io.h>
1717
#include <linux/module.h>
18+
#include <linux/of.h>
1819
#include <linux/of_address.h>
1920
#include <linux/of_irq.h>
2021
#include <linux/of_mdio.h>
2122
#include <linux/of_net.h>
22-
#include <linux/of_platform.h>
2323

2424
#include "emac.h"
2525

drivers/net/ethernet/atheros/ag71xx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929

3030
#include <linux/if_vlan.h>
3131
#include <linux/mfd/syscon.h>
32+
#include <linux/of.h>
3233
#include <linux/of_mdio.h>
3334
#include <linux/of_net.h>
34-
#include <linux/of_platform.h>
35+
#include <linux/platform_device.h>
3536
#include <linux/phylink.h>
3637
#include <linux/regmap.h>
3738
#include <linux/reset.h>

drivers/net/ethernet/cadence/macb_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/platform_device.h>
2727
#include <linux/phylink.h>
2828
#include <linux/of.h>
29-
#include <linux/of_device.h>
3029
#include <linux/of_gpio.h>
3130
#include <linux/of_mdio.h>
3231
#include <linux/of_net.h>

drivers/net/ethernet/cirrus/cs89x0.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
#include <linux/netdevice.h>
5555
#include <linux/etherdevice.h>
5656
#include <linux/of.h>
57-
#include <linux/of_device.h>
5857
#include <linux/platform_device.h>
5958
#include <linux/kernel.h>
6059
#include <linux/types.h>

drivers/net/ethernet/ezchip/nps_enet.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
#include <linux/module.h>
77
#include <linux/etherdevice.h>
88
#include <linux/interrupt.h>
9-
#include <linux/of_address.h>
10-
#include <linux/of_irq.h>
9+
#include <linux/mod_devicetable.h>
1110
#include <linux/of_net.h>
12-
#include <linux/of_platform.h>
11+
#include <linux/platform_device.h>
1312
#include "nps_enet.h"
1413

1514
#define DRV_NAME "nps_mgt_enet"

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
88

99
#include <linux/init.h>
10+
#include <linux/mod_devicetable.h>
1011
#include <linux/module.h>
11-
#include <linux/of_platform.h>
1212
#include <linux/of_mdio.h>
1313
#include <linux/of_net.h>
1414
#include <linux/io.h>
@@ -17,6 +17,7 @@
1717
#include <linux/icmp.h>
1818
#include <linux/ip.h>
1919
#include <linux/ipv6.h>
20+
#include <linux/platform_device.h>
2021
#include <linux/udp.h>
2122
#include <linux/tcp.h>
2223
#include <linux/net.h>

drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
77

88
#include <linux/string.h>
9+
#include <linux/of.h>
910
#include <linux/of_platform.h>
11+
#include <linux/platform_device.h>
1012
#include <linux/net_tstamp.h>
1113
#include <linux/fsl/ptp_qoriq.h>
1214

0 commit comments

Comments
 (0)