diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2020-08-27 05:00:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-27 16:55:50 +0300 |
| commit | 232e15e1d7ddb191c28248cb681f4544c0ff1c54 (patch) | |
| tree | a97546f38333a9cead791193e6cdf0f8711fad11 | |
| parent | fcba68bd75bb1d42b3aec7f471d382a9e639a672 (diff) | |
| download | linux-232e15e1d7ddb191c28248cb681f4544c0ff1c54.tar.xz | |
net: xgene: Move shared header file into include/linux
This header file is currently included into the ethernet driver via a
relative path into the PHY subsystem. This is bad practice, and causes
issues for the upcoming move of the MDIO driver. Move the header file
into include/linux to clean this up.
v2:
Move header to include/linux/mdio
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 | ||||
| -rw-r--r-- | drivers/net/phy/mdio-xgene.c | 2 | ||||
| -rw-r--r-- | include/linux/mdio/mdio-xgene.h (renamed from drivers/net/phy/mdio-xgene.h) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h index d35a338120cf..643f5e646740 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h @@ -18,6 +18,7 @@ #include <linux/of_platform.h> #include <linux/of_net.h> #include <linux/of_mdio.h> +#include <linux/mdio/mdio-xgene.h> #include <linux/module.h> #include <net/ip.h> #include <linux/prefetch.h> @@ -26,7 +27,6 @@ #include "xgene_enet_hw.h" #include "xgene_enet_cle.h" #include "xgene_enet_ring2.h" -#include "../../../phy/mdio-xgene.h" #define ETHER_MIN_PACKET 64 #define ETHER_STD_PACKET 1518 diff --git a/drivers/net/phy/mdio-xgene.c b/drivers/net/phy/mdio-xgene.c index 34990eaa3298..461207cdf5d6 100644 --- a/drivers/net/phy/mdio-xgene.c +++ b/drivers/net/phy/mdio-xgene.c @@ -11,6 +11,7 @@ #include <linux/efi.h> #include <linux/if_vlan.h> #include <linux/io.h> +#include <linux/mdio/mdio-xgene.h> #include <linux/module.h> #include <linux/of_platform.h> #include <linux/of_net.h> @@ -18,7 +19,6 @@ #include <linux/prefetch.h> #include <linux/phy.h> #include <net/ip.h> -#include "mdio-xgene.h" static bool xgene_mdio_status; diff --git a/drivers/net/phy/mdio-xgene.h b/include/linux/mdio/mdio-xgene.h index 8af93ada8b64..8af93ada8b64 100644 --- a/drivers/net/phy/mdio-xgene.h +++ b/include/linux/mdio/mdio-xgene.h |