netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 7/7] net: mscc: ocelot: unregister net devices on unbind
Date: Tue, 15 Sep 2020 21:22:29 +0300	[thread overview]
Message-ID: <20200915182229.69529-8-olteanv@gmail.com> (raw)
In-Reply-To: <20200915182229.69529-1-olteanv@gmail.com>

From: Vladimir Oltean <vladimir.oltean@nxp.com>

This driver was not unregistering its network interfaces on unbind.
Now it is.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/mscc/ocelot_vsc7514.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 851e79e11aed..b8f895483653 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -896,6 +896,26 @@ static struct ptp_clock_info ocelot_ptp_clock_info = {
 	.enable		= ocelot_ptp_enable,
 };
 
+static void mscc_ocelot_release_ports(struct ocelot *ocelot)
+{
+	int port;
+
+	for (port = 0; port < ocelot->num_phys_ports; port++) {
+		struct ocelot_port_private *priv;
+		struct ocelot_port *ocelot_port;
+
+		ocelot_port = ocelot->ports[port];
+		if (!ocelot_port)
+			continue;
+
+		priv = container_of(ocelot_port, struct ocelot_port_private,
+				    port);
+
+		unregister_netdev(priv->dev);
+		free_netdev(priv->dev);
+	}
+}
+
 static int mscc_ocelot_init_ports(struct platform_device *pdev)
 {
 	struct ocelot *ocelot = platform_get_drvdata(pdev);
@@ -1008,6 +1028,7 @@ static int mscc_ocelot_init_ports(struct platform_device *pdev)
 
 out_put_ports:
 	of_node_put(ports);
+	mscc_ocelot_release_ports(ocelot);
 	return err;
 }
 
@@ -1132,6 +1153,7 @@ static int mscc_ocelot_remove(struct platform_device *pdev)
 	struct ocelot *ocelot = platform_get_drvdata(pdev);
 
 	ocelot_deinit_timestamp(ocelot);
+	mscc_ocelot_release_ports(ocelot);
 	ocelot_deinit(ocelot);
 	unregister_switchdev_blocking_notifier(&ocelot_switchdev_blocking_nb);
 	unregister_switchdev_notifier(&ocelot_switchdev_nb);
-- 
2.25.1


  parent reply	other threads:[~2020-09-15 18:26 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15 18:22 [PATCH net 0/7] Bugfixes in Microsemi Ocelot switch driver Vladimir Oltean
2020-09-15 18:22 ` [PATCH net 1/7] net: mscc: ocelot: fix race condition with TX timestamping Vladimir Oltean
2020-09-15 18:22 ` [PATCH net 2/7] net: mscc: ocelot: add locking for the port TX timestamp ID Vladimir Oltean
2020-09-16 11:12   ` Alexandre Belloni
2020-09-16 12:25     ` Vladimir Oltean
2020-09-17  0:19   ` David Miller
2020-09-17 23:43     ` Vladimir Oltean
2020-09-17 23:57       ` David Miller
2020-09-15 18:22 ` [PATCH net 3/7] net: dsa: seville: fix buffer size of the queue system Vladimir Oltean
2020-09-15 18:22 ` [PATCH net 4/7] net: mscc: ocelot: check for errors on memory allocation of ports Vladimir Oltean
2020-09-17  0:21   ` David Miller
2020-09-15 18:22 ` [PATCH net 5/7] net: mscc: ocelot: error checking when calling ocelot_init() Vladimir Oltean
2020-09-17  0:24   ` David Miller
2020-09-15 18:22 ` [PATCH net 6/7] net: mscc: ocelot: refactor ports parsing code into a dedicated function Vladimir Oltean
2020-09-15 18:22 ` Vladimir Oltean [this message]
2020-09-15 21:19 ` [PATCH net 0/7] Bugfixes in Microsemi Ocelot switch driver Horatiu Vultur
2020-09-16  9:56 ` Alexandre Belloni

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=20200915182229.69529-8-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).