Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / atarilance.c

diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index b57d7dee389a6b43d87c6556962270b0a1fead22..8cb27cb7bca1b347c0b072d25e98ef5b58acdb5a 100644 (file)
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -362,7 +362,7 @@ static void *slow_memcpy( void *dst, const void *src, size_t len )
                *cto++ = *cfrom++;
                MFPDELAY();
        }
-       return( dst );
+       return dst;
 }
 
 
@@ -407,7 +407,7 @@ static noinline int __init addr_accessible(volatile void *regp, int wordflag,
                                           int writeflag)
 {
        int             ret;
-       long    flags;
+       unsigned long   flags;
        long    *vbr, save_berr;
 
        local_irq_save(flags);
@@ -449,7 +449,7 @@ static noinline int __init addr_accessible(volatile void *regp, int wordflag,
        vbr[2] = save_berr;
        local_irq_restore(flags);
 
-       return( ret );
+       return ret;
 }
 
 static const struct net_device_ops lance_netdev_ops = {
@@ -526,7 +526,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
        goto probe_ok;
 
   probe_fail:
-       return( 0 );
+       return 0;
 
   probe_ok:
        lp = netdev_priv(dev);
@@ -556,7 +556,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
                if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO,
                            "PAM/Riebl-ST Ethernet", dev)) {
                        printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 );
-                       return( 0 );
+                       return 0;
                }
                dev->irq = (unsigned short)IRQ_AUTO_5;
        }
@@ -568,12 +568,12 @@ static unsigned long __init lance_probe1( struct net_device *dev,
                unsigned long irq = atari_register_vme_int();
                if (!irq) {
                        printk( "Lance: request for VME interrupt failed\n" );
-                       return( 0 );
+                       return 0;
                }
                if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO,
                            "Riebl-VME Ethernet", dev)) {
                        printk( "Lance: request for irq %ld failed\n", irq );
-                       return( 0 );
+                       return 0;
                }
                dev->irq = irq;
        }
@@ -637,7 +637,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
        /* XXX MSch */
        dev->watchdog_timeo = TX_TIMEOUT;
 
-       return( 1 );
+       return 1;
 }
 
 
@@ -666,7 +666,7 @@ static int lance_open( struct net_device *dev )
                DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n",
                                          dev->name, i, DREG ));
                DREG = CSR0_STOP;
-               return( -EIO );
+               return -EIO;
        }
        DREG = CSR0_IDON;
        DREG = CSR0_STRT;
@@ -676,7 +676,7 @@ static int lance_open( struct net_device *dev )
 
        DPRINTK( 2, ( "%s: LANCE is open, csr0 %04x\n", dev->name, DREG ));
 
-       return( 0 );
+       return 0;
 }
 
 
@@ -1126,13 +1126,13 @@ static int lance_set_mac_address( struct net_device *dev, void *addr )
        int i;
 
        if (lp->cardtype != OLD_RIEBL && lp->cardtype != NEW_RIEBL)
-               return( -EOPNOTSUPP );
+               return -EOPNOTSUPP;
 
        if (netif_running(dev)) {
                /* Only possible while card isn't started */
                DPRINTK( 1, ( "%s: hwaddr can be set only while card isn't open.\n",
                                          dev->name ));
-               return( -EIO );
+               return -EIO;
        }
 
        memcpy( dev->dev_addr, saddr->sa_data, dev->addr_len );
@@ -1142,7 +1142,7 @@ static int lance_set_mac_address( struct net_device *dev, void *addr )
        /* set also the magic for future sessions */
        *RIEBL_MAGIC_ADDR = RIEBL_MAGIC;
 
-       return( 0 );
+       return 0;
 }