drivers/net: return operator cleanup

Change "return (EXPR);" to "return EXPR;"

return is not a function, parentheses are not required.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 90 insertions, 90 deletions

diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 421d0715310e..1481a446fefb 100644
--- 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 = {
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 43af85b8e45e..70feb84df670 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1022,7 +1022,7 @@ static int lmc_open(struct net_device *dev)
 
     if (sc->lmc_ok){
         lmc_trace(dev, "lmc_open lmc_ok out");
-        return (0);
+        return 0;
     }
 
     lmc_softreset (sc);
@@ -1110,7 +1110,7 @@ static int lmc_open(struct net_device *dev)
 
     lmc_trace(dev, "lmc_open out");
 
-    return (0);
+    return 0;
 }
 
 /* Total reset to compensate for the AdTran DSU doing bad things
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 7a3720f09ce3..17d408fe693f 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -379,14 +379,14 @@ static int __init n2_run(unsigned long io, unsigned long irq,
         if (request_irq(irq, sca_intr, 0, devname, card)) {
                 printk(KERN_ERR "n2: could not allocate IRQ\n");
                 n2_destroy_card(card);
-                return(-EBUSY);
+                return -EBUSY;
         }
         card->irq = irq;
 
         if (!request_mem_region(winbase, USE_WINDOWSIZE, devname)) {
                 printk(KERN_ERR "n2: could not request RAM window\n");
                 n2_destroy_card(card);
-                return(-EBUSY);
+                return -EBUSY;
         }
         card->phy_winbase = winbase;
         card->winbase = ioremap(winbase, USE_WINDOWSIZE);
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index fbf1175a07f1..f875cfae3093 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -451,11 +451,11 @@ static int dma_get_rx_frame_size(pc300_t * card, int ch)
                 if ((status & DST_EOM) || (first_bd == card->chan[ch].rx_last_bd)) {
                         /* Return the size of a good frame or incomplete bad frame 
                         * (dma_buf_read will clean the buffer descriptors in this case). */
-                        return (rcvd);
+                        return rcvd;
                 }
                 ptdescr = (card->hw.rambase + cpc_readl(&ptdescr->next));
         }
-        return (-1);
+        return -1;
 }
 
 /*
@@ -557,7 +557,7 @@ static int dma_buf_read(pc300_t * card, int ch, struct sk_buff *skb)
                 cpc_writel(card->hw.scabase + DRX_REG(EDAL, ch),
                            RX_BD_ADDR(ch, chan->rx_last_bd));
         }
-        return (rcvd);
+        return rcvd;
 }
 
 static void tx_dma_stop(pc300_t * card, int ch)
@@ -1733,7 +1733,7 @@ static u16 falc_pattern_test_error(pc300_t * card, int ch)
         pc300ch_t *chan = (pc300ch_t *) & card->chan[ch];
         falc_t *pfalc = (falc_t *) & chan->falc;
 
-        return (pfalc->bec);
+        return pfalc->bec;
 }
 
 /**********************************/
@@ -2819,7 +2819,7 @@ static int clock_rate_calc(u32 rate, u32 clock, int *br_io)
         *br_io = 0;
 
         if (rate == 0)
-                return (0);
+                return 0;
 
         for (br = 0, br_pwr = 1; br <= 9; br++, br_pwr <<= 1) {
                 if ((tc = clock / br_pwr / rate) <= 0xff) {
@@ -2832,11 +2832,11 @@ static int clock_rate_calc(u32 rate, u32 clock, int *br_io)
                 error = ((rate - (clock / br_pwr / rate)) / rate) * 1000;
                 /* Errors bigger than +/- 1% won't be tolerated */
                 if (error < -10 || error > 10)
-                        return (-1);
+                        return -1;
                 else
-                        return (tc);
+                        return tc;
         } else {
-                return (-1);
+                return -1;
         }
 }
 
@@ -3207,7 +3207,7 @@ static u32 detect_ram(pc300_t * card)
                         break;
                 }
         }
-        return (i);
+        return i;
 }
 
 static void plx_init(pc300_t * card)
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index 4293889e287e..515d9b8af01e 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -540,7 +540,7 @@ static int cpc_tty_chars_in_buffer(struct tty_struct *tty)
                 return -ENODEV; 
         }
    
-        return(0); 
+        return 0;
 } 
 
 static int pc300_tiocmset(struct tty_struct *tty, struct file *file,
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index f4125da2762f..3f4e2b5684db 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -178,7 +178,7 @@ static char sdla_byte(struct net_device *dev, int addr)
         byte = *temp;
         spin_unlock_irqrestore(&sdla_lock, flags);
 
-        return(byte);
+        return byte;
 }
 
 static void sdla_stop(struct net_device *dev)
@@ -267,7 +267,7 @@ static int sdla_z80_poll(struct net_device *dev, int z80_addr, int jiffs, char r
                         resp = *temp;
                 }
         }
-        return(time_before(jiffies, done) ? jiffies - start : -1);
+        return time_before(jiffies, done) ? jiffies - start : -1;
 }
 
 /* constants for Z80 CPU speed */
@@ -283,13 +283,13 @@ static int sdla_cpuspeed(struct net_device *dev, struct ifreq *ifr)
 
         sdla_start(dev);
         if (sdla_z80_poll(dev, 0, 3*HZ, Z80_READY, 0) < 0)
-                return(-EIO);
+                return -EIO;
 
         data = LOADER_READY;
         sdla_write(dev, 0, &data, 1);
 
         if ((jiffs = sdla_z80_poll(dev, 0, 8*HZ, Z80_SCC_OK, Z80_SCC_BAD)) < 0)
-                return(-EIO);
+                return -EIO;
 
         sdla_stop(dev);
         sdla_read(dev, 0, &data, 1);
@@ -297,11 +297,11 @@ static int sdla_cpuspeed(struct net_device *dev, struct ifreq *ifr)
         if (data == Z80_SCC_BAD)
         {
                 printk("%s: SCC bad\n", dev->name);
-                return(-EIO);
+                return -EIO;
         }
 
         if (data != Z80_SCC_OK)
-                return(-EINVAL);
+                return -EINVAL;
 
         if (jiffs < 165)
                 ifr->ifr_mtu = SDLA_CPU_16M;
@@ -316,7 +316,7 @@ static int sdla_cpuspeed(struct net_device *dev, struct ifreq *ifr)
         else
                 ifr->ifr_mtu = SDLA_CPU_3M;
  
-        return(0);
+        return 0;
 }
 
 /************************************************
@@ -493,7 +493,7 @@ static int sdla_cmd(struct net_device *dev, int cmd, short dlci, short flags,
         if (ret != SDLA_RET_OK)
                 sdla_errors(dev, cmd, dlci, ret, len, &status);
 
-        return(ret);
+        return ret;
 }
 
 /***********************************************
@@ -516,14 +516,14 @@ static int sdla_activate(struct net_device *slave, struct net_device *master)
                         break;
 
         if (i == CONFIG_DLCI_MAX)
-                return(-ENODEV);
+                return -ENODEV;
 
         flp->dlci[i] = abs(flp->dlci[i]);
 
         if (netif_running(slave) && (flp->config.station == FRAD_STATION_NODE))
                 sdla_cmd(slave, SDLA_ACTIVATE_DLCI, 0, 0, &flp->dlci[i], sizeof(short), NULL, NULL);
 
-        return(0);
+        return 0;
 }
 
 static int sdla_deactivate(struct net_device *slave, struct net_device *master)
@@ -538,14 +538,14 @@ static int sdla_deactivate(struct net_device *slave, struct net_device *master)
                         break;
 
         if (i == CONFIG_DLCI_MAX)
-                return(-ENODEV);
+                return -ENODEV;
 
         flp->dlci[i] = -abs(flp->dlci[i]);
 
         if (netif_running(slave) && (flp->config.station == FRAD_STATION_NODE))
                 sdla_cmd(slave, SDLA_DEACTIVATE_DLCI, 0, 0, &flp->dlci[i], sizeof(short), NULL, NULL);
 
-        return(0);
+        return 0;
 }
 
 static int sdla_assoc(struct net_device *slave, struct net_device *master)
@@ -554,7 +554,7 @@ static int sdla_assoc(struct net_device *slave, struct net_device *master)
         int               i;
 
         if (master->type != ARPHRD_DLCI)
-                return(-EINVAL);
+                return -EINVAL;
 
         flp = netdev_priv(slave);
 
@@ -563,11 +563,11 @@ static int sdla_assoc(struct net_device *slave, struct net_device *master)
                 if (!flp->master[i])
                         break;
                 if (abs(flp->dlci[i]) == *(short *)(master->dev_addr))
-                        return(-EADDRINUSE);
+                        return -EADDRINUSE;
         } 
 
         if (i == CONFIG_DLCI_MAX)
-                return(-EMLINK);  /* #### Alan: Comments on this ?? */
+                return -EMLINK;  /* #### Alan: Comments on this ?? */
 
 
         flp->master[i] = master;
@@ -581,7 +581,7 @@ static int sdla_assoc(struct net_device *slave, struct net_device *master)
                         sdla_cmd(slave, SDLA_ADD_DLCI, 0, 0, master->dev_addr, sizeof(short), NULL, NULL);
         }
 
-        return(0);
+        return 0;
 }
 
 static int sdla_deassoc(struct net_device *slave, struct net_device *master)
@@ -596,7 +596,7 @@ static int sdla_deassoc(struct net_device *slave, struct net_device *master)
                         break;
 
         if (i == CONFIG_DLCI_MAX)
-                return(-ENODEV);
+                return -ENODEV;
 
         flp->master[i] = NULL;
         flp->dlci[i] = 0;
@@ -609,7 +609,7 @@ static int sdla_deassoc(struct net_device *slave, struct net_device *master)
                         sdla_cmd(slave, SDLA_DELETE_DLCI, 0, 0, master->dev_addr, sizeof(short), NULL, NULL);
         }
 
-        return(0);
+        return 0;
 }
 
 static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, int get)
@@ -626,7 +626,7 @@ static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, i
                         break;
 
         if (i == CONFIG_DLCI_MAX)
-                return(-ENODEV);
+                return -ENODEV;
 
         dlp = netdev_priv(master);
 
@@ -641,7 +641,7 @@ static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, i
                                     &dlp->config, sizeof(struct dlci_conf) - 4 * sizeof(short), NULL, NULL);
         }
 
-        return(ret == SDLA_RET_OK ? 0 : -EIO);
+        return ret == SDLA_RET_OK ? 0 : -EIO;
 }
 
 /**************************
@@ -986,7 +986,7 @@ static int sdla_close(struct net_device *dev)
 
         netif_stop_queue(dev);
         
-        return(0);
+        return 0;
 }
 
 struct conf_data {
@@ -1006,10 +1006,10 @@ static int sdla_open(struct net_device *dev)
         flp = netdev_priv(dev);
 
         if (!flp->initialized)
-                return(-EPERM);
+                return -EPERM;
 
         if (!flp->configured)
-                return(-EPERM);
+                return -EPERM;
 
         /* time to send in the configuration */
         len = 0;
@@ -1087,7 +1087,7 @@ static int sdla_open(struct net_device *dev)
 
         netif_start_queue(dev);
         
-        return(0);
+        return 0;
 }
 
 static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, int get)
@@ -1098,48 +1098,48 @@ static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, in
         short             size;
 
         if (dev->type == 0xFFFF)
-                return(-EUNATCH);
+                return -EUNATCH;
 
         flp = netdev_priv(dev);
 
         if (!get)
         {
                 if (netif_running(dev))
-                        return(-EBUSY);
+                        return -EBUSY;
 
                 if(copy_from_user(&data.config, conf, sizeof(struct frad_conf)))
                         return -EFAULT;
 
                 if (data.config.station & ~FRAD_STATION_NODE)
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if (data.config.flags & ~FRAD_VALID_FLAGS)
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.kbaud < 0) || 
                          ((data.config.kbaud > 128) && (flp->type != SDLA_S508)))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if (data.config.clocking & ~(FRAD_CLOCK_INT | SDLA_S508_PORT_RS232))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.mtu < 0) || (data.config.mtu > SDLA_MAX_MTU))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.T391 < 5) || (data.config.T391 > 30))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.T392 < 5) || (data.config.T392 > 30))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.N391 < 1) || (data.config.N391 > 255))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.N392 < 1) || (data.config.N392 > 10))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.N393 < 1) || (data.config.N393 > 10))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 memcpy(&flp->config, &data.config, sizeof(struct frad_conf));
                 flp->config.flags |= SDLA_DIRECT_RECV;
@@ -1171,7 +1171,7 @@ static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, in
                 {
                         size = sizeof(data);
                         if (sdla_cmd(dev, SDLA_READ_DLCI_CONFIGURATION, 0, 0, NULL, 0, &data, &size) != SDLA_RET_OK)
-                                return(-EIO);
+                                return -EIO;
                 }
                 else
                         if (flp->configured)
@@ -1185,7 +1185,7 @@ static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, in
                 return copy_to_user(conf, &data.config, sizeof(struct frad_conf))?-EFAULT:0;
         }
 
-        return(0);
+        return 0;
 }
 
 static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int read)
@@ -1200,7 +1200,7 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
         {       
                 temp = kzalloc(mem.len, GFP_KERNEL);
                 if (!temp)
-                        return(-ENOMEM);
+                        return -ENOMEM;
                 sdla_read(dev, mem.addr, temp, mem.len);
                 if(copy_to_user(mem.data, temp, mem.len))
                 {
@@ -1217,7 +1217,7 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
                 sdla_write(dev, mem.addr, temp, mem.len);
                 kfree(temp);
         }
-        return(0);
+        return 0;
 }
 
 static int sdla_reconfig(struct net_device *dev)
@@ -1241,7 +1241,7 @@ static int sdla_reconfig(struct net_device *dev)
         sdla_cmd(dev, SDLA_SET_DLCI_CONFIGURATION, 0, 0, &data, len, NULL, NULL);
         sdla_cmd(dev, SDLA_ENABLE_COMMUNICATIONS, 0, 0, NULL, 0, NULL, NULL);
 
-        return(0);
+        return 0;
 }
 
 static int sdla_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -1254,20 +1254,20 @@ static int sdla_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         flp = netdev_priv(dev);
 
         if (!flp->initialized)
-                return(-EINVAL);
+                return -EINVAL;
 
         switch (cmd)
         {
                 case FRAD_GET_CONF:
                 case FRAD_SET_CONF:
-                        return(sdla_config(dev, ifr->ifr_data, cmd == FRAD_GET_CONF));
+                        return sdla_config(dev, ifr->ifr_data, cmd == FRAD_GET_CONF);
 
                 case SDLA_IDENTIFY:
                         ifr->ifr_flags = flp->type;
                         break;
 
                 case SDLA_CPUSPEED:
-                        return(sdla_cpuspeed(dev, ifr)); 
+                        return sdla_cpuspeed(dev, ifr);
 
 /* ==========================================================
 NOTE:  This is rather a useless action right now, as the
@@ -1277,7 +1277,7 @@ NOTE:  This is rather a useless action right now, as the
 ============================================================*/
                 case SDLA_PROTOCOL:
                         if (flp->configured)
-                                return(-EALREADY);
+                                return -EALREADY;
 
                         switch (ifr->ifr_flags)
                         {
@@ -1285,7 +1285,7 @@ NOTE:  This is rather a useless action right now, as the
                                         dev->type = ifr->ifr_flags;
                                         break;
                                 default:
-                                        return(-ENOPROTOOPT);
+                                        return -ENOPROTOOPT;
                         }
                         break;
 
@@ -1297,7 +1297,7 @@ NOTE:  This is rather a useless action right now, as the
                 case SDLA_READMEM:
                         if(!capable(CAP_SYS_RAWIO))
                                 return -EPERM;
-                        return(sdla_xfer(dev, ifr->ifr_data, cmd == SDLA_READMEM));
+                        return sdla_xfer(dev, ifr->ifr_data, cmd == SDLA_READMEM);
 
                 case SDLA_START:
                         sdla_start(dev);
@@ -1308,9 +1308,9 @@ NOTE:  This is rather a useless action right now, as the
                         break;
 
                 default:
-                        return(-EOPNOTSUPP);
+                        return -EOPNOTSUPP;
         }
-        return(0);
+        return 0;
 }
 
 static int sdla_change_mtu(struct net_device *dev, int new_mtu)
@@ -1320,10 +1320,10 @@ static int sdla_change_mtu(struct net_device *dev, int new_mtu)
         flp = netdev_priv(dev);
 
         if (netif_running(dev))
-                return(-EBUSY);
+                return -EBUSY;
 
         /* for now, you can't change the MTU! */
-        return(-EOPNOTSUPP);
+        return -EOPNOTSUPP;
 }
 
 static int sdla_set_config(struct net_device *dev, struct ifmap *map)
@@ -1337,18 +1337,18 @@ static int sdla_set_config(struct net_device *dev, struct ifmap *map)
         flp = netdev_priv(dev);
 
         if (flp->initialized)
-                return(-EINVAL);
+                return -EINVAL;
 
         for(i=0; i < ARRAY_SIZE(valid_port); i++)
                 if (valid_port[i] == map->base_addr)
                         break;   
 
         if (i == ARRAY_SIZE(valid_port))
-                return(-EINVAL);
+                return -EINVAL;
 
         if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){
                 printk(KERN_WARNING "SDLA: io-port 0x%04lx in use\n", dev->base_addr);
-                return(-EINVAL);
+                return -EINVAL;
         }
         base = map->base_addr;
 
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index e47f5a986b1c..d81ad8397885 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -648,7 +648,7 @@ static int x25_asy_esc(unsigned char *s, unsigned char *d, int len)
                 }
         }
         *ptr++ = X25_END;
-        return (ptr - d);
+        return ptr - d;
 }
 
 static void x25_asy_unesc(struct x25_asy *sl, unsigned char s)