Skip to contentSkip to conversation

net: phy/pcs: Explicitly include correct DT includes

PATCH Applied Rob Herring 3 participants 3 messages Jul 24, 2023 – Jul 27, 2023

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: phy/pcs: 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.

---
v2:
- Split out can, dsa, wireless, phy/pcs to separate patches

---
 drivers/net/pcs/pcs-rzn1-miic.c   | 1 +
 drivers/net/phy/marvell-88x2222.c | 1 -
 drivers/net/phy/mediatek-ge-soc.c | 2 --
 3 files changed, 1 insertion(+), 3 deletions(-)
drivers/net/pcs/pcs-rzn1-miic.c +1 -0
index 323bec5e57f8..e5d642c67a2c 100644
@@ -12,6 +12,7 @@
 #include <linux/of_platform.h>
 #include <linux/pcs-rzn1-miic.h>
 #include <linux/phylink.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <dt-bindings/net/pcs-rzn1-miic.h>
 
drivers/net/phy/marvell-88x2222.c +0 -1
index f83cae64585d..e3aa30dad2e6 100644
@@ -14,7 +14,6 @@
 #include <linux/mdio.h>
 #include <linux/marvell_phy.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/sfp.h>
 #include <linux/netdevice.h>
drivers/net/phy/mediatek-ge-soc.c +0 -2
index 95369171a7ba..da512fab0eb0 100644
@@ -2,8 +2,6 @@
 #include <linux/bitfield.h>
 #include <linux/module.h>
 #include <linux/nvmem-consumer.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/phy.h>
 
Signature · 1 line
2.40.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · Rob Herring

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.

#2 lore raw
In reply to Rob Herring
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Mon, 24 Jul 2023 15:19:05 -0600 you wrote:

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.

[...]

Here is the summary with links:
- [v2] net: phy/pcs: Explicitly include correct DT includes

    https://git.kernel.org/netdev/net-next/c/ac3cb6de32b6

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html