Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2635c4fd authored by Andrew Lunn's avatar Andrew Lunn Committed by Greg Kroah-Hartman
Browse files

net: xgene: Move shared header file into include/linux 



[ Upstream commit 232e15e1d7ddb191c28248cb681f4544c0ff1c54 ]

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: 7083df59abbc ("net: mdio-mux-meson-g12a: force internal PHY off on mux switch")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a70b966c

drivers/net/ethernet/apm/xgene/xgene_enet_main.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/of_net.h>

#include <linux/of_net.h>

#include <linux/of_mdio.h>

#include <linux/of_mdio.h>

#include <linux/mdio/mdio-xgene.h>

#include <linux/module.h>

#include <linux/module.h>

#include <net/ip.h>

#include <net/ip.h>

#include <linux/prefetch.h>

#include <linux/prefetch.h>
@@ -26,7 +27,6 @@ 
#include "xgene_enet_hw.h"

#include "xgene_enet_hw.h"

#include "xgene_enet_cle.h"

#include "xgene_enet_cle.h"

#include "xgene_enet_ring2.h"

#include "xgene_enet_ring2.h"

#include "../../../phy/mdio-xgene.h"





#define XGENE_DRV_VERSION	"v1.0"

#define XGENE_DRV_VERSION	"v1.0"

#define ETHER_MIN_PACKET	64

#define ETHER_MIN_PACKET	64

drivers/net/phy/mdio-xgene.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/efi.h>

#include <linux/efi.h>

#include <linux/if_vlan.h>

#include <linux/if_vlan.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/mdio/mdio-xgene.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/of_net.h>

#include <linux/of_net.h>
@@ -18,7 +19,6 @@ 
#include <linux/prefetch.h>

#include <linux/prefetch.h>

#include <linux/phy.h>

#include <linux/phy.h>

#include <net/ip.h>

#include <net/ip.h>

#include "mdio-xgene.h"





static bool xgene_mdio_status;

static bool xgene_mdio_status;