Commit d95fa750 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski

net: dsa: if ds->setup is true, ds->devlink is always non-NULL

Simplify dsa_switch_teardown() to remove the NULL checking for
ds->devlink.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5cf2c75b
...@@ -682,8 +682,9 @@ static int dsa_switch_setup(struct dsa_switch *ds) ...@@ -682,8 +682,9 @@ static int dsa_switch_setup(struct dsa_switch *ds)
goto free_slave_mii_bus; goto free_slave_mii_bus;
} }
ds->setup = true;
devlink_register(ds->devlink); devlink_register(ds->devlink);
ds->setup = true;
return 0; return 0;
free_slave_mii_bus: free_slave_mii_bus:
...@@ -705,8 +706,7 @@ static void dsa_switch_teardown(struct dsa_switch *ds) ...@@ -705,8 +706,7 @@ static void dsa_switch_teardown(struct dsa_switch *ds)
if (!ds->setup) if (!ds->setup)
return; return;
if (ds->devlink) devlink_unregister(ds->devlink);
devlink_unregister(ds->devlink);
if (ds->slave_mii_bus && ds->ops->phy_read) { if (ds->slave_mii_bus && ds->ops->phy_read) {
mdiobus_unregister(ds->slave_mii_bus); mdiobus_unregister(ds->slave_mii_bus);
...@@ -721,10 +721,8 @@ static void dsa_switch_teardown(struct dsa_switch *ds) ...@@ -721,10 +721,8 @@ static void dsa_switch_teardown(struct dsa_switch *ds)
dsa_switch_unregister_notifier(ds); dsa_switch_unregister_notifier(ds);
if (ds->devlink) { devlink_free(ds->devlink);
devlink_free(ds->devlink); ds->devlink = NULL;
ds->devlink = NULL;
}
ds->setup = false; ds->setup = false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment