Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / net / skfp / fplustm.c

diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 9d8d1ac48176dfc1558de9f944cb6bf6cadee26a..ca4e7bb6a5a8a0f592778821bf722c1d25803cfa 100644 (file)
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -112,8 +112,8 @@ static u_long mac_get_tneg(struct s_smc *smc)
        u_long  tneg ;
 
        tneg = (u_long)((long)inpw(FM_A(FM_TNEG))<<5) ;
-       return((u_long)((tneg + ((inpw(FM_A(FM_TMRS))>>10)&0x1f)) |
-               0xffe00000L)) ;
+       return (u_long)((tneg + ((inpw(FM_A(FM_TMRS))>>10)&0x1f)) |
+               0xffe00000L) ;
 }
 
 void mac_update_counter(struct s_smc *smc)
@@ -163,7 +163,7 @@ static u_long read_mdr(struct s_smc *smc, unsigned int addr)
                        /* is used */
        p = (u_long)inpw(FM_A(FM_MDRU))<<16 ;
        p += (u_long)inpw(FM_A(FM_MDRL)) ;
-       return(p) ;
+       return p;
 }
 #endif
 
@@ -887,7 +887,7 @@ int init_fplus(struct s_smc *smc)
        /* make sure all PCI settings are correct */
        mac_do_pci_fix(smc) ;
 
-       return(init_mac(smc,1)) ;
+       return init_mac(smc, 1);
        /* enable_formac(smc) ; */
 }
 
@@ -989,7 +989,7 @@ static int init_mac(struct s_smc *smc, int all)
        }
        smc->hw.hw_state = STARTED ;
 
-       return(0) ;
+       return 0;
 }
 
 
@@ -1049,7 +1049,7 @@ void sm_ma_control(struct s_smc *smc, int mode)
 
 int sm_mac_get_tx_state(struct s_smc *smc)
 {
-       return((inpw(FM_A(FM_STMCHN))>>4)&7) ;
+       return (inpw(FM_A(FM_STMCHN))>>4) & 7;
 }
 
 /*
@@ -1084,9 +1084,9 @@ static struct s_fpmc* mac_get_mc_table(struct s_smc *smc,
                }
                if (memcmp((char *)&tb->a,(char *)own,6))
                        continue ;
-               return(tb) ;
+               return tb;
        }
-       return(slot) ;                  /* return first free or NULL */
+       return slot;                    /* return first free or NULL */
 }
 
 /*
@@ -1152,12 +1152,12 @@ int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can)
         */
        if (can & 0x80) {
                if (smc->hw.fp.smt_slots_used >= SMT_MAX_MULTI) {
-                       return(1) ;
+                       return 1;
                }
        }
        else {
                if (smc->hw.fp.os_slots_used >= FPMAX_MULTICAST-SMT_MAX_MULTI) {
-                       return(1) ;
+                       return 1;
                }
        }
 
@@ -1165,7 +1165,7 @@ int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can)
         * find empty slot
         */
        if (!(tb = mac_get_mc_table(smc,addr,&own,0,can & ~0x80)))
-               return(1) ;
+               return 1;
        tb->n++ ;
        tb->a = own ;
        tb->perm = (can & 0x80) ? 1 : 0 ;
@@ -1175,7 +1175,7 @@ int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can)
        else
                smc->hw.fp.os_slots_used++ ;
 
-       return(0) ;
+       return 0;
 }
 
 /*