net_sched: use void pointer for filter handle

Now we use 'unsigned long fh' as a pointer in every place,
it is safe to convert it to a void pointer now. This gets
rid of many casts to pointer.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 12 deletions

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 7c7a82138f76..73cc7f167a38 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -56,20 +56,18 @@ static int basic_classify(struct sk_buff *skb, const struct tcf_proto *tp,
         return -1;
 }
 
-static unsigned long basic_get(struct tcf_proto *tp, u32 handle)
+static void *basic_get(struct tcf_proto *tp, u32 handle)
 {
-        unsigned long l = 0UL;
         struct basic_head *head = rtnl_dereference(tp->root);
         struct basic_filter *f;
 
         list_for_each_entry(f, &head->flist, link) {
                 if (f->handle == handle) {
-                        l = (unsigned long) f;
-                        break;
+                        return f;
                 }
         }
 
-        return l;
+        return NULL;
 }
 
 static int basic_init(struct tcf_proto *tp)
@@ -106,10 +104,10 @@ static void basic_destroy(struct tcf_proto *tp)
         kfree_rcu(head, rcu);
 }
 
-static int basic_delete(struct tcf_proto *tp, unsigned long arg, bool *last)
+static int basic_delete(struct tcf_proto *tp, void *arg, bool *last)
 {
         struct basic_head *head = rtnl_dereference(tp->root);
-        struct basic_filter *f = (struct basic_filter *) arg;
+        struct basic_filter *f = arg;
 
         list_del_rcu(&f->link);
         tcf_unbind_filter(tp, &f->res);
@@ -149,7 +147,7 @@ static int basic_set_parms(struct net *net, struct tcf_proto *tp,
 
 static int basic_change(struct net *net, struct sk_buff *in_skb,
                         struct tcf_proto *tp, unsigned long base, u32 handle,
-                        struct nlattr **tca, unsigned long *arg, bool ovr)
+                        struct nlattr **tca, void **arg, bool ovr)
 {
         int err;
         struct basic_head *head = rtnl_dereference(tp->root);
@@ -202,7 +200,7 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
         if (err < 0)
                 goto errout;
 
-        *arg = (unsigned long)fnew;
+        *arg = fnew;
 
         if (fold) {
                 list_replace_rcu(&fold->link, &fnew->link);
@@ -228,7 +226,7 @@ static void basic_walk(struct tcf_proto *tp, struct tcf_walker *arg)
                 if (arg->count < arg->skip)
                         goto skip;
 
-                if (arg->fn(tp, (unsigned long) f, arg) < 0) {
+                if (arg->fn(tp, f, arg) < 0) {
                         arg->stop = 1;
                         break;
                 }
@@ -237,10 +235,10 @@ skip:
         }
 }
 
-static int basic_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
+static int basic_dump(struct net *net, struct tcf_proto *tp, void *fh,
                       struct sk_buff *skb, struct tcmsg *t)
 {
-        struct basic_filter *f = (struct basic_filter *) fh;
+        struct basic_filter *f = fh;
         struct nlattr *nest;
 
         if (f == NULL)