[NET]: Remove more unneeded typecasts on *malloc()

This removes more unneeded casts on the return value for kmalloc(),
sock_kmalloc(), and vmalloc().

Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 10 insertions, 11 deletions

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 34758118c10c..192092b89e53 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -975,7 +975,7 @@ static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im)
          * for deleted items allows change reports to use common code with
          * non-deleted or query-response MCA's.
          */
-        pmc = (struct ip_mc_list *)kmalloc(sizeof(*pmc), GFP_KERNEL);
+        pmc = kmalloc(sizeof(*pmc), GFP_KERNEL);
         if (!pmc)
                 return;
         memset(pmc, 0, sizeof(*pmc));
@@ -1155,7 +1155,7 @@ void ip_mc_inc_group(struct in_device *in_dev, u32 addr)
                 }
         }
 
-        im = (struct ip_mc_list *)kmalloc(sizeof(*im), GFP_KERNEL);
+        im = kmalloc(sizeof(*im), GFP_KERNEL);
         if (!im)
                 goto out;
 
@@ -1476,7 +1476,7 @@ static int ip_mc_add1_src(struct ip_mc_list *pmc, int sfmode,
                 psf_prev = psf;
         }
         if (!psf) {
-                psf = (struct ip_sf_list *)kmalloc(sizeof(*psf), GFP_ATOMIC);
+                psf = kmalloc(sizeof(*psf), GFP_ATOMIC);
                 if (!psf)
                         return -ENOBUFS;
                 memset(psf, 0, sizeof(*psf));
@@ -1659,7 +1659,7 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
         err = -ENOBUFS;
         if (count >= sysctl_igmp_max_memberships)
                 goto done;
-        iml = (struct ip_mc_socklist *)sock_kmalloc(sk,sizeof(*iml),GFP_KERNEL);
+        iml = sock_kmalloc(sk,sizeof(*iml),GFP_KERNEL);
         if (iml == NULL)
                 goto done;
 
@@ -1823,8 +1823,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
 
                 if (psl)
                         count += psl->sl_max;
-                newpsl = (struct ip_sf_socklist *)sock_kmalloc(sk,
-                        IP_SFLSIZE(count), GFP_KERNEL);
+                newpsl = sock_kmalloc(sk, IP_SFLSIZE(count), GFP_KERNEL);
                 if (!newpsl) {
                         err = -ENOBUFS;
                         goto done;
@@ -1907,8 +1906,8 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
                 goto done;
         }
         if (msf->imsf_numsrc) {
-                newpsl = (struct ip_sf_socklist *)sock_kmalloc(sk,
-                                IP_SFLSIZE(msf->imsf_numsrc), GFP_KERNEL);
+                newpsl = sock_kmalloc(sk, IP_SFLSIZE(msf->imsf_numsrc),
+                                                           GFP_KERNEL);
                 if (!newpsl) {
                         err = -ENOBUFS;
                         goto done;
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 6986e11d65cc..2bf8d782f678 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -621,7 +621,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
                                 err = -ENOBUFS;
                                 break;
                         }
-                        msf = (struct ip_msfilter *)kmalloc(optlen, GFP_KERNEL);
+                        msf = kmalloc(optlen, GFP_KERNEL);
                         if (msf == 0) {
                                 err = -ENOBUFS;
                                 break;
@@ -778,7 +778,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
                                 err = -ENOBUFS;
                                 break;
                         }
-                        gsf = (struct group_filter *)kmalloc(optlen,GFP_KERNEL);
+                        gsf = kmalloc(optlen,GFP_KERNEL);
                         if (gsf == 0) {
                                 err = -ENOBUFS;
                                 break;
@@ -798,7 +798,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
                                 goto mc_msf_out;
                         }
                         msize = IP_MSFILTER_SIZE(gsf->gf_numsrc);
-                        msf = (struct ip_msfilter *)kmalloc(msize,GFP_KERNEL);
+                        msf = kmalloc(msize,GFP_KERNEL);
                         if (msf == 0) {
                                 err = -ENOBUFS;
                                 goto mc_msf_out;