drivers/net: return operator cleanup

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / net / wan / dlci.c

diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 421d0715310e2a859b13ec17c21f07f6131086ff..1481a446fefbf6f058c14b6591501b3249ae2d8b 100644 (file)
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -97,11 +97,11 @@ static int dlci_header(struct sk_buff *skb, struct net_device *dev,
 
        dest = skb_push(skb, hlen);
        if (!dest)
-               return(0);
+               return 0;
 
        memcpy(dest, &hdr, hlen);
 
-       return(hlen);
+       return hlen;
 }
 
 static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
@@ -211,14 +211,14 @@ static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, in
                if (copy_from_user(&config, conf, sizeof(struct dlci_conf)))
                        return -EFAULT;
                if (config.flags & ~DLCI_VALID_FLAGS)
-                       return(-EINVAL);
+                       return -EINVAL;
                memcpy(&dlp->config, &config, sizeof(struct dlci_conf));
                dlp->configured = 1;
        }
 
        err = (*flp->dlci_conf)(dlp->slave, dev, get);
        if (err)
-               return(err);
+               return err;
 
        if (get)
        {
@@ -226,7 +226,7 @@ static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, in
                        return -EFAULT;
        }
 
-       return(0);
+       return 0;
 }
 
 static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -234,7 +234,7 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        struct dlci_local *dlp;
 
        if (!capable(CAP_NET_ADMIN))
-               return(-EPERM);
+               return -EPERM;
 
        dlp = netdev_priv(dev);
 
@@ -242,7 +242,7 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        {
                case DLCI_GET_SLAVE:
                        if (!*(short *)(dev->dev_addr))
-                               return(-EINVAL);
+                               return -EINVAL;
 
                        strncpy(ifr->ifr_slave, dlp->slave->name, sizeof(ifr->ifr_slave));
                        break;
@@ -250,15 +250,15 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                case DLCI_GET_CONF:
                case DLCI_SET_CONF:
                        if (!*(short *)(dev->dev_addr))
-                               return(-EINVAL);
+                               return -EINVAL;
 
-                       return(dlci_config(dev, ifr->ifr_data, cmd == DLCI_GET_CONF));
+                       return dlci_config(dev, ifr->ifr_data, cmd == DLCI_GET_CONF);
                        break;
 
                default: 
-                       return(-EOPNOTSUPP);
+                       return -EOPNOTSUPP;
        }
-       return(0);
+       return 0;
 }
 
 static int dlci_change_mtu(struct net_device *dev, int new_mtu)
@@ -277,15 +277,15 @@ static int dlci_open(struct net_device *dev)
        dlp = netdev_priv(dev);
 
        if (!*(short *)(dev->dev_addr))
-               return(-EINVAL);
+               return -EINVAL;
 
        if (!netif_running(dlp->slave))
-               return(-ENOTCONN);
+               return -ENOTCONN;
 
        flp = netdev_priv(dlp->slave);
        err = (*flp->activate)(dlp->slave, dev);
        if (err)
-               return(err);
+               return err;
 
        netif_start_queue(dev);
 
@@ -365,14 +365,14 @@ static int dlci_add(struct dlci_add *dlci)
        list_add(&dlp->list, &dlci_devs);
        rtnl_unlock();
 
-       return(0);
+       return 0;
 
  err2:
        rtnl_unlock();
        free_netdev(master);
  err1:
        dev_put(slave);
-       return(err);
+       return err;
 }
 
 static int dlci_del(struct dlci_add *dlci)
@@ -385,10 +385,10 @@ static int dlci_del(struct dlci_add *dlci)
        /* validate slave device */
        master = __dev_get_by_name(&init_net, dlci->devname);
        if (!master)
-               return(-ENODEV);
+               return -ENODEV;
 
        if (netif_running(master)) {
-               return(-EBUSY);
+               return -EBUSY;
        }
 
        dlp = netdev_priv(master);
@@ -406,7 +406,7 @@ static int dlci_del(struct dlci_add *dlci)
        }
        rtnl_unlock();
 
-       return(err);
+       return err;
 }
 
 static int dlci_ioctl(unsigned int cmd, void __user *arg)
@@ -415,7 +415,7 @@ static int dlci_ioctl(unsigned int cmd, void __user *arg)
        int err;
        
        if (!capable(CAP_NET_ADMIN))
-               return(-EPERM);
+               return -EPERM;
 
        if (copy_from_user(&add, arg, sizeof(struct dlci_add)))
                return -EFAULT;
@@ -438,7 +438,7 @@ static int dlci_ioctl(unsigned int cmd, void __user *arg)
                        err = -EINVAL;
        }
 
-       return(err);
+       return err;
 }
 
 static const struct header_ops dlci_header_ops = {