From: Andrew Lunn <andrew@lunn.ch>
To: netdev <netdev@vger.kernel.org>
Cc: Ioana Ciornei <ioana.ciornei@nxp.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Russell King <rmk+kernel@armlinux.org.uk>,
Heiner Kallweit <hkallweit1@gmail.com>,
Andrew Lunn <andrew@lunn.ch>
Subject: [PATCH RFC net-next 1/3] net: xgene: Move shared header file into include/linux
Date: Mon, 27 Jul 2020 22:47:29 +0200 [thread overview]
Message-ID: <20200727204731.1705418-2-andrew@lunn.ch> (raw)
In-Reply-To: <20200727204731.1705418-1-andrew@lunn.ch>
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.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 +-
drivers/net/phy/mdio-xgene.c | 2 +-
{drivers/net/phy => include/linux}/mdio-xgene.h | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename {drivers/net/phy => include/linux}/mdio-xgene.h (100%)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index d35a338120cf..6ed4ce9d88c5 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-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..0043063a4de0 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-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-xgene.h
similarity index 100%
rename from drivers/net/phy/mdio-xgene.h
rename to include/linux/mdio-xgene.h
--
2.28.0.rc0
next prev parent reply other threads:[~2020-07-27 20:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 20:47 [PATCH RFC net-next 0/3] Restructure drivers/net/phy Andrew Lunn
2020-07-27 20:47 ` Andrew Lunn [this message]
2020-07-27 20:47 ` [PATCH RFC net-next 2/3] net: phy: Move into subdirectories Andrew Lunn
2020-08-03 14:11 ` Madalin Bucur (OSS)
2020-08-03 14:15 ` Andrew Lunn
2020-07-27 20:47 ` [PATCH RFC net-next 3/3] net: phy: Move and rename mdio-xpcs Andrew Lunn
2020-07-27 22:05 ` [PATCH RFC net-next 0/3] Restructure drivers/net/phy Jakub Kicinski
2020-07-27 22:20 ` Andrew Lunn
2020-07-28 15:42 ` Ioana Ciornei
2020-07-28 15:55 ` Russell King - ARM Linux admin
2020-07-28 16:08 ` Andrew Lunn
2020-07-28 16:28 ` Ioana Ciornei
2020-07-29 0:28 ` Doug Berger
2020-07-29 0:34 ` Florian Fainelli
2020-07-31 1:25 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200727204731.1705418-2-andrew@lunn.ch \
--to=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=netdev@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).