netfilter: ipset: Remove unnecessary cast on void pointer

The following Coccinelle script was used to detect this:
@r@
expression x;
void* e;
type T;
identifier f;
@@
(
  *((T *)e)
|
  ((T *)x)[...]
|
  ((T*)x)->f
|

- (T*)
  e
)

Signed-off-by: simran singhal <singhalsimran0@gmail.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h
index 77dd4159528f8a159d4f6768850531c52e37fc43..63cbe24fa24706bec5ce8a1ab8272b3c00f67909 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h
+++ b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h
@@ -234,7 +234,7 @@ mtype_list(const struct ip_set *set,
                if (!test_bit(id, map->members) ||
                    (SET_WITH_TIMEOUT(set) &&
 #ifdef IP_SET_BITMAP_STORED_TIMEOUT
-                    mtype_is_filled((const struct mtype_elem *)x) &&
+                    mtype_is_filled(x) &&
 #endif
                     ip_set_timeout_expired(ext_timeout(x, set))))
                        continue;
@@ -251,7 +251,7 @@ mtype_list(const struct ip_set *set,
                if (mtype_do_list(skb, map, id, set->dsize))
                        goto nla_put_failure;
                if (ip_set_put_extensions(skb, set, x,
-                   mtype_is_filled((const struct mtype_elem *)x)))
+                   mtype_is_filled(x)))
                        goto nla_put_failure;
                ipset_nest_end(skb, nested);
        }

diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index bee479f79ebe055a3d8e4bf65342278777e450d0..f497e992ad418c572f0399a61d10d1ab7c09c6a5 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -1945,7 +1945,7 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len)
                ret = -EFAULT;
                goto done;
        }
-       op = (unsigned int *)data;
+       op = data;
 
        if (*op < IP_SET_OP_VERSION) {
                /* Check the version at the beginning of operations */