summaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>2017-11-03 19:05:23 -0400
committerDavid S. Miller <davem@davemloft.net>2017-11-05 22:31:38 +0900
commit65254108b4655dc55e8d8f62ee895960085e73f4 (patch)
tree5fec65972b01cc9df6c7c84449e24968dbc11e55 /net/dsa
parent8e5bf9759a06be2251fa96cfd8b412f1808c62f9 (diff)
downloadlinux-65254108b4655dc55e8d8f62ee895960085e73f4.tar.gz
linux-65254108b4655dc55e8d8f62ee895960085e73f4.tar.bz2
linux-65254108b4655dc55e8d8f62ee895960085e73f4.zip
net: dsa: get and put tree reference counting
Provide convenient dsa_tree_get and dsa_tree_put functions scoping a DSA tree used to increment and decrement its reference counter, instead of poking directly its kref structure. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/dsa2.c38
1 files changed, 27 insertions, 11 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index d3f1a7607463..609d92684505 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -38,15 +38,6 @@ static struct dsa_switch_tree *dsa_get_dst(unsigned int index)
return NULL;
}
-static void dsa_free_dst(struct kref *ref)
-{
- struct dsa_switch_tree *dst = container_of(ref, struct dsa_switch_tree,
- refcount);
-
- list_del(&dst->list);
- kfree(dst);
-}
-
static struct dsa_switch_tree *dsa_add_dst(unsigned int index)
{
struct dsa_switch_tree *dst;
@@ -65,10 +56,35 @@ static struct dsa_switch_tree *dsa_add_dst(unsigned int index)
return dst;
}
+static void dsa_tree_free(struct dsa_switch_tree *dst)
+{
+ list_del(&dst->list);
+ kfree(dst);
+}
+
+static void dsa_tree_get(struct dsa_switch_tree *dst)
+{
+ kref_get(&dst->refcount);
+}
+
+static void dsa_tree_release(struct kref *ref)
+{
+ struct dsa_switch_tree *dst;
+
+ dst = container_of(ref, struct dsa_switch_tree, refcount);
+
+ dsa_tree_free(dst);
+}
+
+static void dsa_tree_put(struct dsa_switch_tree *dst)
+{
+ kref_put(&dst->refcount, dsa_tree_release);
+}
+
static void dsa_dst_add_ds(struct dsa_switch_tree *dst,
struct dsa_switch *ds, u32 index)
{
- kref_get(&dst->refcount);
+ dsa_tree_get(dst);
dst->ds[index] = ds;
}
@@ -76,7 +92,7 @@ static void dsa_dst_del_ds(struct dsa_switch_tree *dst,
struct dsa_switch *ds, u32 index)
{
dst->ds[index] = NULL;
- kref_put(&dst->refcount, dsa_free_dst);
+ dsa_tree_put(dst);
}
/* For platform data configurations, we need to have a valid name argument to