Commit 49463b7f authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller

net: dsa: make tree index unsigned

Similarly to a DSA switch and port, rename the tree index from "tree" to
"index" and make it an unsigned int because it isn't supposed to be less
than 0.

u32 is an OF specific data used to retrieve the value and has no need to
be propagated up to the tree index.
Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99feaafc
...@@ -116,7 +116,7 @@ struct dsa_switch_tree { ...@@ -116,7 +116,7 @@ struct dsa_switch_tree {
struct raw_notifier_head nh; struct raw_notifier_head nh;
/* Tree identifier */ /* Tree identifier */
u32 tree; unsigned int index;
/* Number of switches attached to this tree */ /* Number of switches attached to this tree */
struct kref refcount; struct kref refcount;
......
...@@ -27,12 +27,12 @@ static DEFINE_MUTEX(dsa2_mutex); ...@@ -27,12 +27,12 @@ static DEFINE_MUTEX(dsa2_mutex);
static const struct devlink_ops dsa_devlink_ops = { static const struct devlink_ops dsa_devlink_ops = {
}; };
static struct dsa_switch_tree *dsa_get_dst(u32 tree) static struct dsa_switch_tree *dsa_get_dst(unsigned int index)
{ {
struct dsa_switch_tree *dst; struct dsa_switch_tree *dst;
list_for_each_entry(dst, &dsa_switch_trees, list) list_for_each_entry(dst, &dsa_switch_trees, list)
if (dst->tree == tree) { if (dst->index == index) {
kref_get(&dst->refcount); kref_get(&dst->refcount);
return dst; return dst;
} }
...@@ -53,14 +53,14 @@ static void dsa_put_dst(struct dsa_switch_tree *dst) ...@@ -53,14 +53,14 @@ static void dsa_put_dst(struct dsa_switch_tree *dst)
kref_put(&dst->refcount, dsa_free_dst); kref_put(&dst->refcount, dsa_free_dst);
} }
static struct dsa_switch_tree *dsa_add_dst(u32 tree) static struct dsa_switch_tree *dsa_add_dst(unsigned int index)
{ {
struct dsa_switch_tree *dst; struct dsa_switch_tree *dst;
dst = kzalloc(sizeof(*dst), GFP_KERNEL); dst = kzalloc(sizeof(*dst), GFP_KERNEL);
if (!dst) if (!dst)
return NULL; return NULL;
dst->tree = tree; dst->index = index;
INIT_LIST_HEAD(&dst->list); INIT_LIST_HEAD(&dst->list);
list_add_tail(&dsa_switch_trees, &dst->list); list_add_tail(&dsa_switch_trees, &dst->list);
kref_init(&dst->refcount); kref_init(&dst->refcount);
...@@ -454,7 +454,7 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst) ...@@ -454,7 +454,7 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst)
dst->cpu_dp = NULL; dst->cpu_dp = NULL;
pr_info("DSA: tree %d unapplied\n", dst->tree); pr_info("DSA: tree %d unapplied\n", dst->index);
dst->applied = false; dst->applied = false;
} }
...@@ -504,7 +504,7 @@ static int dsa_ds_parse(struct dsa_switch_tree *dst, struct dsa_switch *ds) ...@@ -504,7 +504,7 @@ static int dsa_ds_parse(struct dsa_switch_tree *dst, struct dsa_switch *ds)
} }
pr_info("DSA: switch %d %d parsed\n", dst->tree, ds->index); pr_info("DSA: switch %d %d parsed\n", dst->index, ds->index);
return 0; return 0;
} }
...@@ -549,7 +549,7 @@ static int dsa_dst_parse(struct dsa_switch_tree *dst) ...@@ -549,7 +549,7 @@ static int dsa_dst_parse(struct dsa_switch_tree *dst)
} }
} }
pr_info("DSA: tree %d parsed\n", dst->tree); pr_info("DSA: tree %d parsed\n", dst->index);
return 0; return 0;
} }
......
...@@ -55,7 +55,7 @@ void dsa_slave_mii_bus_init(struct dsa_switch *ds) ...@@ -55,7 +55,7 @@ void dsa_slave_mii_bus_init(struct dsa_switch *ds)
ds->slave_mii_bus->read = dsa_slave_phy_read; ds->slave_mii_bus->read = dsa_slave_phy_read;
ds->slave_mii_bus->write = dsa_slave_phy_write; ds->slave_mii_bus->write = dsa_slave_phy_write;
snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d.%d", snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d.%d",
ds->dst->tree, ds->index); ds->dst->index, ds->index);
ds->slave_mii_bus->parent = ds->dev; ds->slave_mii_bus->parent = ds->dev;
ds->slave_mii_bus->phy_mask = ~ds->phys_mii_mask; ds->slave_mii_bus->phy_mask = ~ds->phys_mii_mask;
} }
......
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