UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: dsa: remove tree functions related to switches 

The DSA fabric setup code has been simplified a lot so get rid of
the dsa_tree_remove_switch, dsa_tree_add_switch and dsa_switch_add
helpers, and keep the code simple with only the dsa_switch_probe and
dsa_switch_remove functions.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2019-10-30 22:09:17 -04:00 committed by David S. Miller
parent 9c8ad1ab66
commit 8e5cb84c67
1 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
net/dsa/dsa2.c
View File

@ -573,29 +573,6 @@ static void dsa_tree_teardown(struct dsa_switch_tree *dst)
dst->setup = false; dst->setup = false;
} }
static void dsa_tree_remove_switch(struct dsa_switch_tree *dst,
unsigned int index)
{
dsa_tree_teardown(dst);
dsa_tree_put(dst);
}
static int dsa_tree_add_switch(struct dsa_switch_tree *dst,
struct dsa_switch *ds)
{
int err;
dsa_tree_get(dst);
err = dsa_tree_setup(dst);
if (err) {
dsa_tree_put(dst);
}
return err;
}
static struct dsa_port *dsa_port_touch(struct dsa_switch *ds, int index) static struct dsa_port *dsa_port_touch(struct dsa_switch *ds, int index)
{ {
struct dsa_switch_tree *dst = ds->dst; struct dsa_switch_tree *dst = ds->dst;
@ -846,15 +823,9 @@ static int dsa_switch_parse(struct dsa_switch *ds, struct dsa_chip_data *cd)
return dsa_switch_parse_ports(ds, cd); return dsa_switch_parse_ports(ds, cd);
} }
static int dsa_switch_add(struct dsa_switch *ds)
{
struct dsa_switch_tree *dst = ds->dst;
return dsa_tree_add_switch(dst, ds);
}
static int dsa_switch_probe(struct dsa_switch *ds) static int dsa_switch_probe(struct dsa_switch *ds)
{ {
struct dsa_switch_tree *dst;
struct dsa_chip_data *pdata; struct dsa_chip_data *pdata;
struct device_node *np; struct device_node *np;
int err; int err;
@ -878,7 +849,13 @@ static int dsa_switch_probe(struct dsa_switch *ds)
if (err) if (err)
return err; return err;
return dsa_switch_add(ds); dst = ds->dst;
dsa_tree_get(dst);
err = dsa_tree_setup(dst);
if (err)
dsa_tree_put(dst);
return err;
} }
int dsa_register_switch(struct dsa_switch *ds) int dsa_register_switch(struct dsa_switch *ds)
@ -897,7 +874,6 @@ EXPORT_SYMBOL_GPL(dsa_register_switch);
static void dsa_switch_remove(struct dsa_switch *ds) static void dsa_switch_remove(struct dsa_switch *ds)
{ {
struct dsa_switch_tree *dst = ds->dst; struct dsa_switch_tree *dst = ds->dst;
unsigned int index = ds->index;
struct dsa_port *dp, *next; struct dsa_port *dp, *next;
list_for_each_entry_safe(dp, next, &dst->ports, list) { list_for_each_entry_safe(dp, next, &dst->ports, list) {
@ -905,7 +881,8 @@ static void dsa_switch_remove(struct dsa_switch *ds)
kfree(dp); kfree(dp);
} }
dsa_tree_remove_switch(dst, index); dsa_tree_teardown(dst);
dsa_tree_put(dst);
} }
void dsa_unregister_switch(struct dsa_switch *ds) void dsa_unregister_switch(struct dsa_switch *ds)