[PATCH v3 net-next 05/10] net: dsa: felix: perform teardown in reverse order of setup

[Vladimir Oltean]

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

In general it is desirable that cleanup is the reverse process of setup.
In this case I am not seeing any particular issue, but with the
introduction of devlink-sb for felix, a non-obvious decision had to be
made as to where to put its cleanup method. When there's a convention in
place, that decision becomes obvious.

Signed-off-by: Vladimir Oltean <vladimir.olt...@nxp.com>
---
Changes in v3:
None.

Changes in v2:
None.

 drivers/net/dsa/ocelot/felix.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 79d0508e5910..42770a86e871 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -639,14 +639,13 @@ static void felix_teardown(struct dsa_switch *ds)
        struct felix *felix = ocelot_to_felix(ocelot);
        int port;
 
-       if (felix->info->mdio_bus_free)
-               felix->info->mdio_bus_free(ocelot);
-
+       if (ocelot->ptp)
+               ocelot_deinit_timestamp(ocelot);
+       ocelot_deinit(ocelot);
        for (port = 0; port < ocelot->num_phys_ports; port++)
                ocelot_deinit_port(ocelot, port);
-       ocelot_deinit_timestamp(ocelot);
-       /* stop workqueue thread */
-       ocelot_deinit(ocelot);
+       if (felix->info->mdio_bus_free)
+               felix->info->mdio_bus_free(ocelot);
 }
 
 static int felix_hwtstamp_get(struct dsa_switch *ds, int port,
-- 
2.25.1