From: Vladimir Oltean <olteanv@gmail.com>
To: davem@davemloft.net, netdev@vger.kernel.org
Cc: yangbo.lu@nxp.com, xiaoliang.yang_1@nxp.com,
UNGLinuxDriver@microchip.com, claudiu.manoil@nxp.com,
alexandre.belloni@bootlin.com, andrew@lunn.ch,
vivien.didelot@gmail.com, f.fainelli@gmail.com, kuba@kernel.org
Subject: [PATCH net-next 08/11] net: dsa: seville: duplicate vsc9959_mdio_bus_free
Date: Fri, 18 Sep 2020 13:57:50 +0300 [thread overview]
Message-ID: <20200918105753.3473725-9-olteanv@gmail.com> (raw)
In-Reply-To: <20200918105753.3473725-1-olteanv@gmail.com>
From: Vladimir Oltean <vladimir.oltean@nxp.com>
While we don't plan on making any changes to this function, currently
this is the only remaining dependency between felix and seville, after
the PCS has been refactored out into pcs-lynx.c.
Duplicate this function in seville to break the dependency completely.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
drivers/net/dsa/ocelot/felix.h | 2 --
drivers/net/dsa/ocelot/felix_vsc9959.c | 2 +-
drivers/net/dsa/ocelot/seville_vsc9953.c | 19 ++++++++++++++++++-
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h
index 807f18b74847..1d41eeda126e 100644
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -55,6 +55,4 @@ struct felix {
resource_size_t imdio_base;
};
-void vsc9959_mdio_bus_free(struct ocelot *ocelot);
-
#endif
diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 4dbc3283f7ea..b198fe9cb62b 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -936,7 +936,7 @@ static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot)
return 0;
}
-void vsc9959_mdio_bus_free(struct ocelot *ocelot)
+static void vsc9959_mdio_bus_free(struct ocelot *ocelot)
{
struct felix *felix = ocelot_to_felix(ocelot);
int port;
diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index 224f7326ddb6..23f66bb1ab4e 100644
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -981,6 +981,23 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)
return 0;
}
+static void vsc9953_mdio_bus_free(struct ocelot *ocelot)
+{
+ struct felix *felix = ocelot_to_felix(ocelot);
+ int port;
+
+ for (port = 0; port < ocelot->num_phys_ports; port++) {
+ struct lynx_pcs *pcs = felix->pcs[port];
+
+ if (!pcs)
+ continue;
+
+ mdio_device_free(pcs->mdio);
+ lynx_pcs_destroy(pcs);
+ }
+ mdiobus_unregister(felix->imdio);
+}
+
static void vsc9953_xmit_template_populate(struct ocelot *ocelot, int port)
{
struct ocelot_port *ocelot_port = ocelot->ports[port];
@@ -1014,7 +1031,7 @@ static const struct felix_info seville_info_vsc9953 = {
.num_mact_rows = 2048,
.num_ports = 10,
.mdio_bus_alloc = vsc9953_mdio_bus_alloc,
- .mdio_bus_free = vsc9959_mdio_bus_free,
+ .mdio_bus_free = vsc9953_mdio_bus_free,
.phylink_validate = vsc9953_phylink_validate,
.prevalidate_phy_mode = vsc9953_prevalidate_phy_mode,
.xmit_template_populate = vsc9953_xmit_template_populate,
--
2.25.1
next prev parent reply other threads:[~2020-09-18 10:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 10:57 [PATCH net-next 00/11] Felix DSA driver cleanup: build Seville separately Vladimir Oltean
2020-09-18 10:57 ` [PATCH net-next 01/11] net: dsa: felix: use ocelot_field_{read,write} helpers consistently Vladimir Oltean
2020-09-18 10:57 ` [PATCH net-next 02/11] net: dsa: seville: don't write to MEM_ENA twice Vladimir Oltean
2020-09-18 10:57 ` [PATCH net-next 03/11] net: dsa: seville: first enable memories, then initialize them Vladimir Oltean
2020-09-18 10:57 ` [PATCH net-next 04/11] net: dsa: ocelot: document why reset procedure is different for felix/seville Vladimir Oltean
2020-09-18 10:57 ` [PATCH net-next 05/11] net: dsa: seville: remove unused defines for the mdio controller Vladimir Oltean
2020-09-18 15:46 ` Alexandre Belloni
2020-09-18 15:54 ` Vladimir Oltean
2020-09-18 17:37 ` Alexandre Belloni
2020-09-18 18:59 ` Vladimir Oltean
2020-09-18 20:11 ` Alexandre Belloni
2020-09-18 10:57 ` [PATCH net-next 06/11] net: dsa: seville: reindent defines for MDIO controller Vladimir Oltean
2020-09-18 10:57 ` [PATCH net-next 07/11] net: dsa: felix: replace tabs with spaces Vladimir Oltean
2020-09-18 10:57 ` Vladimir Oltean [this message]
2020-09-18 10:57 ` [PATCH net-next 09/11] net: mscc: ocelot: make ocelot_init_timestamp take a const struct ptp_clock_info Vladimir Oltean
2020-09-18 15:31 ` Alexandre Belloni
2020-09-18 10:57 ` [PATCH net-next 10/11] net: dsa: felix: move the PTP clock structure to felix_vsc9959.c Vladimir Oltean
2020-09-18 10:57 ` [PATCH net-next 11/11] net: dsa: seville: build as separate module Vladimir Oltean
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=20200918105753.3473725-9-olteanv@gmail.com \
--to=olteanv@gmail.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@gmail.com \
--cc=xiaoliang.yang_1@nxp.com \
--cc=yangbo.lu@nxp.com \
/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).