[PATCH] netdev: get rid of casts

[PATCH] netdev: get rid of casts

[Stephen Hemminger]

The following casts are unnecessary, just passing void * will do.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
---
 net/core/dev.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index 18c51b4..61e9da2 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1981,7 +1981,7 @@ int register_gifconf(unsigned int family, gifconf_func_t * gifconf)
  *	match.  --pb
  */
 
-static int dev_ifname(struct ifreq __user *arg)
+static int dev_ifname(void __user *arg)
 {
 	struct net_device *dev;
 	struct ifreq ifr;
@@ -2014,7 +2014,7 @@ static int dev_ifname(struct ifreq __user *arg)
  *	Thus we will need a 'compatibility mode'.
  */
 
-static int dev_ifconf(char __user *arg)
+static int dev_ifconf(void __user *arg)
 {
 	struct ifconf ifc;
 	struct net_device *dev;
@@ -2778,12 +2778,12 @@ int dev_ioctl(unsigned int cmd, void __user *arg)
 
 	if (cmd == SIOCGIFCONF) {
 		rtnl_lock();
-		ret = dev_ifconf((char __user *) arg);
+		ret = dev_ifconf(arg);
 		rtnl_unlock();
-		return ret;
 	}
+
 	if (cmd == SIOCGIFNAME)
-		return dev_ifname((struct ifreq __user *)arg);
+		return dev_ifname(arg);
 
 	if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
 		return -EFAULT;
-- 
1.5.0.6

Re: [PATCH] netdev: get rid of casts

[Jeff Garzik]

Stephen Hemminger wrote:
> The following casts are unnecessary, just passing void * will do.
> 
> Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
> ---
>  net/core/dev.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 18c51b4..61e9da2 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -1981,7 +1981,7 @@ int register_gifconf(unsigned int family, gifconf_func_t * gifconf)
>   *	match.  --pb
>   */
>  
> -static int dev_ifname(struct ifreq __user *arg)
> +static int dev_ifname(void __user *arg)
>  {
>  	struct net_device *dev;
>  	struct ifreq ifr;
> @@ -2014,7 +2014,7 @@ static int dev_ifname(struct ifreq __user *arg)
>   *	Thus we will need a 'compatibility mode'.
>   */
>  
> -static int dev_ifconf(char __user *arg)
> +static int dev_ifconf(void __user *arg)
>  {
>  	struct ifconf ifc;
>  	struct net_device *dev;
> @@ -2778,12 +2778,12 @@ int dev_ioctl(unsigned int cmd, void __user *arg)
>  
>  	if (cmd == SIOCGIFCONF) {
>  		rtnl_lock();
> -		ret = dev_ifconf((char __user *) arg);
> +		ret = dev_ifconf(arg);
>  		rtnl_unlock();
> -		return ret;
>  	}
> +
>  	if (cmd == SIOCGIFNAME)
> -		return dev_ifname((struct ifreq __user *)arg);
> +		return dev_ifname(arg);

Seems like a net loss of information, with your patch.

The casts are adding missing type information, in this case.  Certainly 
it is more for human consumption than compiler consumption, but 
nonetheless...

	Jeff

Re: [PATCH] netdev: get rid of casts

[David Miller]

From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 24 Apr 2007 14:07:32 -0400

> Stephen Hemminger wrote:
> > The following casts are unnecessary, just passing void * will do.
> > 
> > Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
> > ---
> >  net/core/dev.c |   10 +++++-----
> >  1 files changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/net/core/dev.c b/net/core/dev.c
> > index 18c51b4..61e9da2 100644
> > --- a/net/core/dev.c
> > +++ b/net/core/dev.c
> > @@ -1981,7 +1981,7 @@ int register_gifconf(unsigned int family, gifconf_func_t * gifconf)
> >   *	match.  --pb
> >   */
> >  
> > -static int dev_ifname(struct ifreq __user *arg)
> > +static int dev_ifname(void __user *arg)
> >  {
> >  	struct net_device *dev;
> >  	struct ifreq ifr;
> > @@ -2014,7 +2014,7 @@ static int dev_ifname(struct ifreq __user *arg)
> >   *	Thus we will need a 'compatibility mode'.
> >   */
> >  
> > -static int dev_ifconf(char __user *arg)
> > +static int dev_ifconf(void __user *arg)
> >  {
> >  	struct ifconf ifc;
> >  	struct net_device *dev;
> > @@ -2778,12 +2778,12 @@ int dev_ioctl(unsigned int cmd, void __user *arg)
> >  
> >  	if (cmd == SIOCGIFCONF) {
> >  		rtnl_lock();
> > -		ret = dev_ifconf((char __user *) arg);
> > +		ret = dev_ifconf(arg);
> >  		rtnl_unlock();
> > -		return ret;
> >  	}
> > +
> >  	if (cmd == SIOCGIFNAME)
> > -		return dev_ifname((struct ifreq __user *)arg);
> > +		return dev_ifname(arg);
> 
> Seems like a net loss of information, with your patch.
> 
> The casts are adding missing type information, in this case.  Certainly 
> it is more for human consumption than compiler consumption, but 
> nonetheless...

I agree, I think I'll drop this one therefore.

Re: [PATCH] netdev: get rid of casts

[Herbert Xu]

Jeff Garzik <jeff@garzik.org> wrote:
>
>> @@ -2778,12 +2778,12 @@ int dev_ioctl(unsigned int cmd, void __user *arg)
>>  
>>       if (cmd == SIOCGIFCONF) {
>>               rtnl_lock();
>> -             ret = dev_ifconf((char __user *) arg);
>> +             ret = dev_ifconf(arg);
>>               rtnl_unlock();
>> -             return ret;
>>       }
>> +
>>       if (cmd == SIOCGIFNAME)
>> -             return dev_ifname((struct ifreq __user *)arg);
>> +             return dev_ifname(arg);
> 
> Seems like a net loss of information, with your patch.
> 
> The casts are adding missing type information, in this case.  Certainly 
> it is more for human consumption than compiler consumption, but 
> nonetheless...

How about just getting rid of the casts? 'arg' is already void * to
begin with.
 
Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt