On 18/09/2020 04:07:29+0300, Vladimir Oltean wrote:
> From: Vladimir Oltean <vladimir.olt...@nxp.com>
>
> This driver was not unregistering its network interfaces on unbind.
> Now it is.
>
> Signed-off-by: Vladimir Oltean <vladimir.olt...@nxp.com>
> Reviewed-by: Horatiu Vultur <horatiu.vul...@microchip.com>
Tested-by: Alexandre Belloni <alexandre.bell...@bootlin.com>
Reviewed-by: Alexandre Belloni <alexandre.bell...@bootlin.com>
> ---
> Changes in v2:
> No longer call mscc_ocelot_release_ports from the regular exit path of
> mscc_ocelot_init_ports, which was incorrect.
>
> drivers/net/ethernet/mscc/ocelot_vsc7514.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
> b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
> index ff4a01424953..252c49b5f22b 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 device_node *ports)
> {
> @@ -1132,6 +1152,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
>
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
