14 files changed, 166 insertions, 168 deletions

diff --git a/drivers/net/skfp/cfm.c b/drivers/net/skfp/cfm.c
index 5310d39b5737..e395ace3120b 100644
--- a/drivers/net/skfp/cfm.c
+++ b/drivers/net/skfp/cfm.c
@@ -542,8 +542,8 @@ static void cfm_fsm(struct s_smc *smc, int cmd)
  */
 int cfm_get_mac_input(struct s_smc *smc)
 {
-        return((smc->mib.fddiSMTCF_State == SC10_C_WRAP_B ||
-                smc->mib.fddiSMTCF_State == SC5_THRU_B) ? PB : PA) ;
+        return (smc->mib.fddiSMTCF_State == SC10_C_WRAP_B ||
+                smc->mib.fddiSMTCF_State == SC5_THRU_B) ? PB : PA;
 }
 
 /*
@@ -553,8 +553,8 @@ int cfm_get_mac_input(struct s_smc *smc)
  */
 int cfm_get_mac_output(struct s_smc *smc)
 {
-        return((smc->mib.fddiSMTCF_State == SC10_C_WRAP_B ||
-                smc->mib.fddiSMTCF_State == SC4_THRU_A) ? PB : PA) ;
+        return (smc->mib.fddiSMTCF_State == SC10_C_WRAP_B ||
+                smc->mib.fddiSMTCF_State == SC4_THRU_A) ? PB : PA;
 }
 
 static char path_iso[] = {
@@ -623,5 +623,5 @@ int cem_build_path(struct s_smc *smc, char *to, int path_index)
 
         LINT_USE(path_index);
 
-        return(len) ;
+        return len;
 }
diff --git a/drivers/net/skfp/drvfbi.c b/drivers/net/skfp/drvfbi.c
index c77cc14b3227..07da97c303d6 100644
--- a/drivers/net/skfp/drvfbi.c
+++ b/drivers/net/skfp/drvfbi.c
@@ -267,7 +267,7 @@ void timer_irq(struct s_smc *smc)
 int pcm_get_s_port(struct s_smc *smc)
 {
         SK_UNUSED(smc) ;
-        return(PS) ;
+        return PS;
 }
 
 /*
@@ -366,7 +366,7 @@ void sm_pm_bypass_req(struct s_smc *smc, int mode)
  */
 int sm_pm_bypass_present(struct s_smc *smc)
 {
-        return( (inp(ADDR(B0_DAS)) & DAS_BYP_ST) ? TRUE: FALSE) ;
+        return (inp(ADDR(B0_DAS)) & DAS_BYP_ST) ? TRUE : FALSE;
 }
 
 void plc_clear_irq(struct s_smc *smc, int p)
@@ -483,9 +483,9 @@ static int is_equal_num(char comp1[], char comp2[], int num)
 
         for (i = 0 ; i < num ; i++) {
                 if (comp1[i] != comp2[i])
-                        return (0) ;
+                        return 0;
         }
-                return (1) ;
+                return 1;
 }       /* is_equal_num */
 
 
@@ -522,18 +522,18 @@ int set_oi_id_def(struct s_smc *smc)
                         i++ ;
                         break ;                 /* entry ok */
                 default:
-                        return (1) ;            /* invalid oi_status */
+                        return 1;               /* invalid oi_status */
                 }
         }
 
         if (i == 0)
-                return (2) ;
+                return 2;
         if (!act_entries)
-                return (3) ;
+                return 3;
 
         /* ok, we have a valid OEM data base with an active entry */
         smc->hw.oem_id = (struct s_oem_ids *)  &oem_ids[sel_id] ;
-        return (0) ;
+        return 0;
 }
 #endif  /* MULT_OEM */
 
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c
index e8387d25f24a..8639a0884f5c 100644
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/skfp/ess.c
@@ -135,7 +135,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
          */
         if (!(p = (void *) sm_to_para(smc,sm,SMT_P0015))) {
                 DB_ESS("ESS: RAF frame error, parameter type not found\n",0,0) ;
-                return(fs) ;
+                return fs;
         }
         msg_res_type = ((struct smt_p_0015 *)p)->res_type ;
 
@@ -147,7 +147,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                  * error in frame: para ESS command was not found
                  */
                  DB_ESS("ESS: RAF frame error, parameter command not found\n",0,0);
-                 return(fs) ;
+                 return fs;
         }
 
         DB_ESSN(2,"fc %x        ft %x\n",sm->smt_class,sm->smt_type) ;
@@ -175,12 +175,12 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                          * local and no static allocation is used
                          */
                         if (!local || smc->mib.fddiESSPayload)
-                                return(fs) ;
+                                return fs;
                         
                         p = (void *) sm_to_para(smc,sm,SMT_P0019)  ;
                         for (i = 0; i < 5; i++) {
                                 if (((struct smt_p_0019 *)p)->alloc_addr.a[i]) {
-                                        return(fs) ;
+                                        return fs;
                                 }
                         }
 
@@ -199,10 +199,10 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                         sm->smt_dest = smt_sba_da ;
 
                         if (smc->ess.local_sba_active)
-                                return(fs | I_INDICATOR) ;
+                                return fs | I_INDICATOR;
 
                         if (!(db = smt_get_mbuf(smc)))
-                                return(fs) ;
+                                return fs;
 
                         db->sm_len = mb->sm_len ;
                         db->sm_off = mb->sm_off ;
@@ -212,7 +212,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                                 (struct smt_header *)(db->sm_data+db->sm_off),
                                 "RAF") ;
                         smt_send_frame(smc,db,FC_SMT_INFO,0) ;
-                        return(fs) ;
+                        return fs;
                 }
 
                 /*
@@ -221,7 +221,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                  */
                 if (smt_check_para(smc,sm,plist_raf_alc_res)) {
                         DB_ESS("ESS: RAF with para problem, ignoring\n",0,0) ;
-                        return(fs) ;
+                        return fs;
                 }
 
                 /*
@@ -242,7 +242,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                         (sm->smt_tid != smc->ess.alloc_trans_id)) {
 
                         DB_ESS("ESS: Allocation Responce not accepted\n",0,0) ;
-                        return(fs) ;
+                        return fs;
                 }
 
                 /*
@@ -268,7 +268,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                  */
                 (void)process_bw_alloc(smc,(long)payload,(long)overhead) ;
 
-                return(fs) ;
+                return fs;
                 /* end of Process Allocation Request */
 
         /*
@@ -280,7 +280,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                  */
                 if (sm->smt_type != SMT_REQUEST) {
                         DB_ESS("ESS: Do not process Change Responses\n",0,0) ;
-                        return(fs) ;
+                        return fs;
                 }
 
                 /*
@@ -288,7 +288,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                  */
                 if (smt_check_para(smc,sm,plist_raf_chg_req)) {
                         DB_ESS("ESS: RAF with para problem, ignoring\n",0,0) ;
-                        return(fs) ;
+                        return fs;
                 }
 
                 /*
@@ -300,7 +300,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                 if ((((struct smt_p_320b *)sm_to_para(smc,sm,SMT_P320B))->path_index
                         != PRIMARY_RING) || (msg_res_type != SYNC_BW)) {
                         DB_ESS("ESS: RAF frame with para problem, ignoring\n",0,0) ;
-                        return(fs) ;
+                        return fs;
                 }
 
                 /*
@@ -319,14 +319,14 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                  * process the bandwidth allocation
                  */
                 if(!process_bw_alloc(smc,(long)payload,(long)overhead))
-                        return(fs) ;
+                        return fs;
 
                 /*
                  * send an RAF Change Reply
                  */
                 ess_send_response(smc,sm,CHANGE_ALLOCATION) ;
 
-                return(fs) ;
+                return fs;
                 /* end of Process Change Request */
 
         /*
@@ -338,7 +338,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                  */
                 if (sm->smt_type != SMT_REQUEST) {
                         DB_ESS("ESS: Do not process a Report Reply\n",0,0) ;
-                        return(fs) ;
+                        return fs;
                 }
 
                 DB_ESSN(2,"ESS: Report Request from %s\n",
@@ -349,7 +349,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                  */
                 if (msg_res_type != SYNC_BW) {
                         DB_ESS("ESS: ignoring RAF with para problem\n",0,0) ;
-                        return(fs) ;
+                        return fs;
                 }
 
                 /*
@@ -357,7 +357,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                  */
                 ess_send_response(smc,sm,REPORT_ALLOCATION) ;
 
-                return(fs) ;
+                return fs;
                 /* end of Process Report Request */
 
         default:
@@ -368,7 +368,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
                 break ;
         }
 
-        return(fs) ;
+        return fs;
 }
 
 /*
@@ -418,17 +418,17 @@ static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhe
          */
 /*      if (smt_set_obj(smc,SMT_P320F,payload,S_SET)) {
                 DB_ESS("ESS: SMT does not accept the payload value\n",0,0) ;
-                return(FALSE) ;
+                return FALSE;
         }
         if (smt_set_obj(smc,SMT_P3210,overhead,S_SET)) {
                 DB_ESS("ESS: SMT does not accept the overhead value\n",0,0) ;
-                return(FALSE) ;
+                return FALSE;
         } */
 
         /* premliminary */
         if (payload > MAX_PAYLOAD || overhead > 5000) {
                 DB_ESS("ESS: payload / overhead not accepted\n",0,0) ;
-                return(FALSE) ;
+                return FALSE;
         }
 
         /*
@@ -468,7 +468,7 @@ static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhe
 
         ess_config_fifo(smc) ;
         set_formac_tsync(smc,smc->ess.sync_bw) ;
-        return(TRUE) ;
+        return TRUE;
 }
 
 static void ess_send_response(struct s_smc *smc, struct smt_header *sm,
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 9d8d1ac48176..ca4e7bb6a5a8 100644
--- 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;
 }
 
 /*
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c
index d322f1b702ac..af5a755e269d 100644
--- a/drivers/net/skfp/hwmtm.c
+++ b/drivers/net/skfp/hwmtm.c
@@ -232,16 +232,16 @@ u_int mac_drv_check_space(void)
 #ifdef  COMMON_MB_POOL
         call_count++ ;
         if (call_count == 1) {
-                return(EXT_VIRT_MEM) ;
+                return EXT_VIRT_MEM;
         }
         else {
-                return(EXT_VIRT_MEM_2) ;
+                return EXT_VIRT_MEM_2;
         }
 #else
-        return (EXT_VIRT_MEM) ;
+        return EXT_VIRT_MEM;
 #endif
 #else
-        return (0) ;
+        return 0;
 #endif
 }
 
@@ -271,7 +271,7 @@ int mac_drv_init(struct s_smc *smc)
         if (!(smc->os.hwm.descr_p = (union s_fp_descr volatile *)
                 mac_drv_get_desc_mem(smc,(u_int)
                 (RXD_TXD_COUNT+1)*sizeof(struct s_smt_fp_txd)))) {
-                return(1) ;     /* no space the hwm modul can't work */
+                return 1;       /* no space the hwm modul can't work */
         }
 
         /*
@@ -283,18 +283,18 @@ int mac_drv_init(struct s_smc *smc)
 #ifndef COMMON_MB_POOL
         if (!(smc->os.hwm.mbuf_pool.mb_start = (SMbuf *) mac_drv_get_space(smc,
                 MAX_MBUF*sizeof(SMbuf)))) {
-                return(1) ;     /* no space the hwm modul can't work */
+                return 1;       /* no space the hwm modul can't work */
         }
 #else
         if (!mb_start) {
                 if (!(mb_start = (SMbuf *) mac_drv_get_space(smc,
                         MAX_MBUF*sizeof(SMbuf)))) {
-                        return(1) ;     /* no space the hwm modul can't work */
+                        return 1;       /* no space the hwm modul can't work */
                 }
         }
 #endif
 #endif
-        return (0) ;
+        return 0;
 }
 
 /*
@@ -349,7 +349,7 @@ static u_long init_descr_ring(struct s_smc *smc,
                 DRV_BUF_FLUSH(&d1->r,DDI_DMA_SYNC_FORDEV) ;
                 d1++;
         }
-        return(phys) ;
+        return phys;
 }
 
 static void init_txd_ring(struct s_smc *smc)
@@ -502,7 +502,7 @@ SMbuf *smt_get_mbuf(struct s_smc *smc)
                 mb->sm_use_count = 1 ;
         }
         DB_GEN("get SMbuf: mb = %x",(void *)mb,0,3) ;
-        return (mb) ;   /* May be NULL */
+        return mb;      /* May be NULL */
 }
 
 void smt_free_mbuf(struct s_smc *smc, SMbuf *mb)
@@ -621,7 +621,7 @@ static u_long repair_txd_ring(struct s_smc *smc, struct s_smt_tx_queue *queue)
                 t = t->txd_next ;
                 tx_used-- ;
         }
-        return(phys) ;
+        return phys;
 }
 
 /*
@@ -673,7 +673,7 @@ static u_long repair_rxd_ring(struct s_smc *smc, struct s_smt_rx_queue *queue)
                 r = r->rxd_next ;
                 rx_used-- ;
         }
-        return(phys) ;
+        return phys;
 }
 
 
@@ -1595,7 +1595,7 @@ int hwm_tx_init(struct s_smc *smc, u_char fc, int frag_count, int frame_len,
         }
         DB_TX("frame_status = %x",frame_status,0,3) ;
         NDD_TRACE("THiE",frame_status,smc->os.hwm.tx_p->tx_free,0) ;
-        return(frame_status) ;
+        return frame_status;
 }
 
 /*
@@ -1764,7 +1764,7 @@ static SMbuf *get_llc_rx(struct s_smc *smc)
                 smc->os.hwm.llc_rx_pipe = mb->sm_next ;
         }
         DB_GEN("get_llc_rx: mb = 0x%x",(void *)mb,0,4) ;
-        return(mb) ;
+        return mb;
 }
 
 /*
@@ -1797,7 +1797,7 @@ static SMbuf *get_txd_mb(struct s_smc *smc)
                 smc->os.hwm.txd_tx_pipe = mb->sm_next ;
         }
         DB_GEN("get_txd_mb: mb = 0x%x",(void *)mb,0,4) ;
-        return(mb) ;
+        return mb;
 }
 
 /*
diff --git a/drivers/net/skfp/hwt.c b/drivers/net/skfp/hwt.c
index 053151468f93..e6baa53307c7 100644
--- a/drivers/net/skfp/hwt.c
+++ b/drivers/net/skfp/hwt.c
@@ -179,7 +179,7 @@ u_long hwt_read(struct s_smc *smc)
                 else
                         smc->hw.t_stop = smc->hw.t_start - tr ;
         }
-        return (smc->hw.t_stop) ;
+        return smc->hw.t_stop;
 }
 
 #ifdef  PCI
@@ -208,7 +208,7 @@ u_long hwt_quick_read(struct s_smc *smc)
         outpw(ADDR(B2_TI_CRTL), TIM_START) ;
         outpd(ADDR(B2_TI_INI),interval) ;
 
-        return(time) ;
+        return time;
 }
 
 /************************
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c
index ba45bc794d77..112d35b1bf0e 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/skfp/pcmplc.c
@@ -504,7 +504,7 @@ int sm_pm_get_ls(struct s_smc *smc, int phy)
 
 #ifdef  CONCENTRATOR
         if (!plc_is_installed(smc,phy))
-                return(PC_QLS) ;
+                return PC_QLS;
 #endif
 
         state = inpw(PLC(phy,PL_STATUS_A)) & PL_LINE_ST ;
@@ -528,7 +528,7 @@ int sm_pm_get_ls(struct s_smc *smc, int phy)
         default :
                 state = PC_LS_NONE ;
         }
-        return(state) ;
+        return state;
 }
 
 static int plc_send_bits(struct s_smc *smc, struct s_phy *phy, int len)
@@ -547,7 +547,7 @@ static int plc_send_bits(struct s_smc *smc, struct s_phy *phy, int len)
 #if     0
                 printf("PL_PCM_SIGNAL is set\n") ;
 #endif
-                return(1) ;
+                return 1;
         }
         /* write bit[n] & length = 1 to regs */
         outpw(PLC(np,PL_VECTOR_LEN),len-1) ;    /* len=nr-1 */
@@ -562,7 +562,7 @@ static int plc_send_bits(struct s_smc *smc, struct s_phy *phy, int len)
                 printf("SIGNALING bit %d .. %d\n",phy->bitn,phy->bitn+len-1) ;
 #endif
 #endif
-        return(0) ;
+        return 0;
 }
 
 /*
@@ -1590,12 +1590,12 @@ int pcm_status_twisted(struct s_smc *smc)
 {
         int     twist = 0 ;
         if (smc->s.sas != SMT_DAS)
-                return(0) ;
+                return 0;
         if (smc->y[PA].twisted && (smc->y[PA].mib->fddiPORTPCMState == PC8_ACTIVE))
                 twist |= 1 ;
         if (smc->y[PB].twisted && (smc->y[PB].mib->fddiPORTPCMState == PC8_ACTIVE))
                 twist |= 2 ;
-        return(twist) ;
+        return twist;
 }
 
 /*
@@ -1636,9 +1636,9 @@ int pcm_rooted_station(struct s_smc *smc)
         for (n = 0 ; n < NUMPHYS ; n++) {
                 if (smc->y[n].mib->fddiPORTPCMState == PC8_ACTIVE &&
                     smc->y[n].mib->fddiPORTNeighborType == TM)
-                        return(0) ;
+                        return 0;
         }
-        return(1) ;
+        return 1;
 }
 
 /*
@@ -1915,7 +1915,7 @@ int get_pcm_state(struct s_smc *smc, int np)
                 case PL_PC9 :   pcs = PC_MAINT ;        break ;
                 default :       pcs = PC_DISABLE ;      break ;
         }
-        return(pcs) ;
+        return pcs;
 }
 
 char *get_linestate(struct s_smc *smc, int np)
@@ -1937,7 +1937,7 @@ char *get_linestate(struct s_smc *smc, int np)
                 default:        ls = "unknown" ; break ;
 #endif
         }
-        return(ls) ;
+        return ls;
 }
 
 char *get_pcmstate(struct s_smc *smc, int np)
@@ -1959,7 +1959,7 @@ char *get_pcmstate(struct s_smc *smc, int np)
                 case PL_PC9 :   pcs = "MAINT" ;         break ;
                 default :       pcs = "UNKNOWN" ;       break ;
         }
-        return(pcs) ;
+        return pcs;
 }
 
 void list_phy(struct s_smc *smc)
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c
index a320fdb3727d..9ac4665d7411 100644
--- a/drivers/net/skfp/pmf.c
+++ b/drivers/net/skfp/pmf.c
@@ -328,7 +328,7 @@ static SMbuf *smt_build_pmf_response(struct s_smc *smc, struct smt_header *req,
          * build SMT header
          */
         if (!(mb = smt_get_mbuf(smc)))
-                return(mb) ;
+                return mb;
 
         smt = smtod(mb, struct smt_header *) ;
         smt->smt_dest = req->smt_source ;       /* DA == source of request */
@@ -493,7 +493,7 @@ static SMbuf *smt_build_pmf_response(struct s_smc *smc, struct smt_header *req,
                 smt_add_para(smc,&set_pcon,(u_short) SMT_P1035,0,0) ;
                 smt_add_para(smc,&set_pcon,(u_short) SMT_P1036,0,0) ;
         }
-        return(mb) ;
+        return mb;
 }
 
 static int smt_authorize(struct s_smc *smc, struct smt_header *sm)
@@ -511,7 +511,7 @@ static int smt_authorize(struct s_smc *smc, struct smt_header *sm)
         if (i != 8) {
                 if (memcmp((char *) &sm->smt_sid,
                         (char *) &smc->mib.fddiPRPMFStation,8))
-                        return(1) ;
+                        return 1;
         }
         /*
          * check authoriziation parameter if passwd not zero
@@ -522,13 +522,13 @@ static int smt_authorize(struct s_smc *smc, struct smt_header *sm)
         if (i != 8) {
                 pa = (struct smt_para *) sm_to_para(smc,sm,SMT_P_AUTHOR) ;
                 if (!pa)
-                        return(1) ;
+                        return 1;
                 if (pa->p_len != 8)
-                        return(1) ;
+                        return 1;
                 if (memcmp((char *)(pa+1),(char *)smc->mib.fddiPRPMFPasswd,8))
-                        return(1) ;
+                        return 1;
         }
-        return(0) ;
+        return 0;
 }
 
 static int smt_check_set_count(struct s_smc *smc, struct smt_header *sm)
@@ -542,9 +542,9 @@ static int smt_check_set_count(struct s_smc *smc, struct smt_header *sm)
                 if ((smc->mib.fddiSMTSetCount.count != sc->count) ||
                         memcmp((char *) smc->mib.fddiSMTSetCount.timestamp,
                         (char *)sc->timestamp,8))
-                        return(1) ;
+                        return 1;
         }
-        return(0) ;
+        return 0;
 }
 
 void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
@@ -1109,7 +1109,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                 break ;
         case 0x2000 :
                 if (mac < 0 || mac >= NUMMACS) {
-                        return(SMT_RDF_NOPARAM) ;
+                        return SMT_RDF_NOPARAM;
                 }
                 mib_m = &smc->mib.m[mac] ;
                 mib_addr = (char *) mib_m ;
@@ -1118,7 +1118,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                 break ;
         case 0x3000 :
                 if (path < 0 || path >= NUMPATHS) {
-                        return(SMT_RDF_NOPARAM) ;
+                        return SMT_RDF_NOPARAM;
                 }
                 mib_a = &smc->mib.a[path] ;
                 mib_addr = (char *) mib_a ;
@@ -1127,7 +1127,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                 break ;
         case 0x4000 :
                 if (port < 0 || port >= smt_mib_phys(smc)) {
-                        return(SMT_RDF_NOPARAM) ;
+                        return SMT_RDF_NOPARAM;
                 }
                 mib_p = &smc->mib.p[port_to_mib(smc,port)] ;
                 mib_addr = (char *) mib_p ;
@@ -1151,22 +1151,20 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
         case SMT_P10F9 :
 #endif
         case SMT_P20F1 :
-                if (!local) {
-                        return(SMT_RDF_NOPARAM) ;
-                }
+                if (!local)
+                        return SMT_RDF_NOPARAM;
                 break ;
         }
         pt = smt_get_ptab(pa->p_type) ;
-        if (!pt) {
-                return( (pa->p_type & 0xff00) ? SMT_RDF_NOPARAM :
-                                                SMT_RDF_ILLEGAL ) ;
-        }
+        if (!pt)
+                return (pa->p_type & 0xff00) ? SMT_RDF_NOPARAM :
+                                               SMT_RDF_ILLEGAL;
         switch (pt->p_access) {
         case AC_GR :
         case AC_S :
                 break ;
         default :
-                return(SMT_RDF_ILLEGAL) ;
+                return SMT_RDF_ILLEGAL;
         }
         to = mib_addr + pt->p_offset ;
         swap = pt->p_swap ;             /* pointer to swap string */
@@ -1292,7 +1290,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                         break ;
                 default :
                         SMT_PANIC(smc,SMT_E0120, SMT_E0120_MSG) ;
-                        return(SMT_RDF_ILLEGAL) ;
+                        return SMT_RDF_ILLEGAL;
                 }
         }
         /*
@@ -1501,15 +1499,15 @@ change_mac_para:
         default :
                 break ;
         }
-        return(0) ;
+        return 0;
 
 val_error:
         /* parameter value in frame is out of range */
-        return(SMT_RDF_RANGE) ;
+        return SMT_RDF_RANGE;
 
 len_error:
         /* parameter value in frame is too short */
-        return(SMT_RDF_LENGTH) ;
+        return SMT_RDF_LENGTH;
 
 #if     0
 no_author_error:
@@ -1518,7 +1516,7 @@ no_author_error:
          *  because SBA denied is not a valid return code in the
          * PMF protocol.
          */
-        return(SMT_RDF_AUTHOR) ;
+        return SMT_RDF_AUTHOR;
 #endif
 }
 
@@ -1527,7 +1525,7 @@ static const struct s_p_tab *smt_get_ptab(u_short para)
         const struct s_p_tab    *pt ;
         for (pt = p_tab ; pt->p_num && pt->p_num != para ; pt++)
                 ;
-        return(pt->p_num ? pt : NULL) ;
+        return pt->p_num ? pt : NULL;
 }
 
 static int smt_mib_phys(struct s_smc *smc)
@@ -1535,11 +1533,11 @@ static int smt_mib_phys(struct s_smc *smc)
 #ifdef  CONCENTRATOR
         SK_UNUSED(smc) ;
 
-        return(NUMPHYS) ;
+        return NUMPHYS;
 #else
         if (smc->s.sas == SMT_SAS)
-                return(1) ;
-        return(NUMPHYS) ;
+                return 1;
+        return NUMPHYS;
 #endif
 }
 
@@ -1548,11 +1546,11 @@ static int port_to_mib(struct s_smc *smc, int p)
 #ifdef  CONCENTRATOR
         SK_UNUSED(smc) ;
 
-        return(p) ;
+        return p;
 #else
         if (smc->s.sas == SMT_SAS)
-                return(PS) ;
-        return(p) ;
+                return PS;
+        return p;
 #endif
 }
 
diff --git a/drivers/net/skfp/queue.c b/drivers/net/skfp/queue.c
index 09adb3d68b7c..c1a0df455a59 100644
--- a/drivers/net/skfp/queue.c
+++ b/drivers/net/skfp/queue.c
@@ -128,7 +128,7 @@ u_short smt_online(struct s_smc *smc, int on)
 {
         queue_event(smc,EVENT_ECM,on ? EC_CONNECT : EC_DISCONNECT) ;
         ev_dispatcher(smc) ;
-        return(smc->mib.fddiSMTCF_State) ;
+        return smc->mib.fddiSMTCF_State;
 }
 
 /*
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 8a12bd9d28ba..ba2e8339fe90 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -440,7 +440,7 @@ static  int skfp_driver_init(struct net_device *dev)
 
         smt_reset_defaults(smc, 0);
 
-        return (0);
+        return 0;
 
 fail:
         if (bp->SharedMemAddr) {
@@ -516,7 +516,7 @@ static int skfp_open(struct net_device *dev)
         mac_drv_rx_mode(smc, RX_DISABLE_PROMISC);
 
         netif_start_queue(dev);
-        return (0);
+        return 0;
 }                               // skfp_open
 
 
@@ -565,7 +565,7 @@ static int skfp_close(struct net_device *dev)
         skb_queue_purge(&bp->SendSkbQueue);
         bp->QueueSkb = MAX_TX_QUEUE_LEN;
 
-        return (0);
+        return 0;
 }                               // skfp_close
 
 
@@ -794,7 +794,7 @@ static struct net_device_stats *skfp_ctl_get_stats(struct net_device *dev)
         bp->stats.port_lem_cts[1] = bp->cmd_rsp_virt->cntrs_get.cntrs.link_errors[1].ls;
 
 #endif
-        return ((struct net_device_stats *) &bp->os.MacStat);
+        return (struct net_device_stats *)&bp->os.MacStat;
 }                               // ctl_get_stat
 
 
@@ -932,7 +932,7 @@ static int skfp_ctl_set_mac_address(struct net_device *dev, void *addr)
         ResetAdapter(smc);
         spin_unlock_irqrestore(&bp->DriverLock, Flags);
 
-        return (0);             /* always return zero */
+        return 0;               /* always return zero */
 }                               // skfp_ctl_set_mac_address
 
 
@@ -1313,7 +1313,7 @@ void *mac_drv_get_space(struct s_smc *smc, unsigned int size)
 
         if ((smc->os.SharedMemHeap + size) > smc->os.SharedMemSize) {
                 printk("Unexpected SMT memory size requested: %d\n", size);
-                return (NULL);
+                return NULL;
         }
         smc->os.SharedMemHeap += size;  // Move heap pointer.
 
@@ -1322,7 +1322,7 @@ void *mac_drv_get_space(struct s_smc *smc, unsigned int size)
         pr_debug("bus  addr: %lx\n", (ulong)
                (smc->os.SharedMemDMA +
                 ((char *) virt - (char *)smc->os.SharedMemAddr)));
-        return (virt);
+        return virt;
 }                               // mac_drv_get_space
 
 
@@ -1363,9 +1363,9 @@ void *mac_drv_get_desc_mem(struct s_smc *smc, unsigned int size)
 
         if (!mac_drv_get_space(smc, size)) {
                 printk("fddi: Unable to align descriptor memory.\n");
-                return (NULL);
+                return NULL;
         }
-        return (virt + size);
+        return virt + size;
 }                               // mac_drv_get_desc_mem
 
 
@@ -1384,8 +1384,8 @@ void *mac_drv_get_desc_mem(struct s_smc *smc, unsigned int size)
  ************************/
 unsigned long mac_drv_virt2phys(struct s_smc *smc, void *virt)
 {
-        return (smc->os.SharedMemDMA +
-                ((char *) virt - (char *)smc->os.SharedMemAddr));
+        return smc->os.SharedMemDMA +
+                ((char *) virt - (char *)smc->os.SharedMemAddr);
 }                               // mac_drv_virt2phys
 
 
@@ -1419,8 +1419,8 @@ unsigned long mac_drv_virt2phys(struct s_smc *smc, void *virt)
  ************************/
 u_long dma_master(struct s_smc * smc, void *virt, int len, int flag)
 {
-        return (smc->os.SharedMemDMA +
-                ((char *) virt - (char *)smc->os.SharedMemAddr));
+        return smc->os.SharedMemDMA +
+                ((char *) virt - (char *)smc->os.SharedMemAddr);
 }                               // dma_master
 
 
@@ -1904,12 +1904,12 @@ int mac_drv_rx_init(struct s_smc *smc, int len, int fc,
                 pr_debug("fddi: Discard invalid local SMT frame\n");
                 pr_debug("  len=%d, la_len=%d, (ULONG) look_ahead=%08lXh.\n",
                        len, la_len, (unsigned long) look_ahead);
-                return (0);
+                return 0;
         }
         skb = alloc_skb(len + 3, GFP_ATOMIC);
         if (!skb) {
                 pr_debug("fddi: Local SMT: skb memory exhausted.\n");
-                return (0);
+                return 0;
         }
         skb_reserve(skb, 3);
         skb_put(skb, len);
@@ -1919,7 +1919,7 @@ int mac_drv_rx_init(struct s_smc *smc, int len, int fc,
         skb->protocol = fddi_type_trans(skb, smc->os.dev);
         netif_rx(skb);
 
-        return (0);
+        return 0;
 }                               // mac_drv_rx_init
 
 
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index 6f35bb77595f..2d9941c045bc 100644
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -127,22 +127,22 @@ static inline int is_my_addr(const struct s_smc *smc,
 
 static inline int is_broadcast(const struct fddi_addr *addr)
 {
-        return(*(u_short *)(&addr->a[0]) == 0xffff &&
+        return *(u_short *)(&addr->a[0]) == 0xffff &&
                *(u_short *)(&addr->a[2]) == 0xffff &&
-               *(u_short *)(&addr->a[4]) == 0xffff ) ;
+               *(u_short *)(&addr->a[4]) == 0xffff;
 }
 
 static inline int is_individual(const struct fddi_addr *addr)
 {
-        return(!(addr->a[0] & GROUP_ADDR)) ;
+        return !(addr->a[0] & GROUP_ADDR);
 }
 
 static inline int is_equal(const struct fddi_addr *addr1, 
                            const struct fddi_addr *addr2)
 {
-        return(*(u_short *)(&addr1->a[0]) == *(u_short *)(&addr2->a[0]) &&
+        return *(u_short *)(&addr1->a[0]) == *(u_short *)(&addr2->a[0]) &&
                *(u_short *)(&addr1->a[2]) == *(u_short *)(&addr2->a[2]) &&
-               *(u_short *)(&addr1->a[4]) == *(u_short *)(&addr2->a[4]) ) ;
+               *(u_short *)(&addr1->a[4]) == *(u_short *)(&addr2->a[4]);
 }
 
 /*
@@ -457,8 +457,8 @@ static int div_ratio(u_long upper, u_long lower)
         else
                 upper <<= 16L ;
         if (!lower)
-                return(0) ;
-        return((int)(upper/lower)) ;
+                return 0;
+        return (int)(upper/lower) ;
 }
 
 #ifndef SLIM_SMT
@@ -1111,11 +1111,11 @@ SMbuf *smt_build_frame(struct s_smc *smc, int class, int type,
 
 #if     0
         if (!smc->r.sm_ma_avail) {
-                return(0) ;
+                return 0;
         }
 #endif
         if (!(mb = smt_get_mbuf(smc)))
-                return(mb) ;
+                return mb;
 
         mb->sm_len = length ;
         smt = smtod(mb, struct smt_header *) ;
@@ -1136,7 +1136,7 @@ SMbuf *smt_build_frame(struct s_smc *smc, int class, int type,
         smt->smt_tid = smt_get_tid(smc) ;       /* set transaction ID */
         smt->smt_pad = 0 ;
         smt->smt_len = length - sizeof(struct smt_header) ;
-        return(mb) ;
+        return mb;
 }
 
 static void smt_add_frame_len(SMbuf *mb, int len)
@@ -1375,7 +1375,7 @@ static int smt_fill_path(struct s_smc *smc, struct smt_p_path *path)
         pd_mac = (struct smt_mac_rec *) phy ;
         pd_mac->mac_addr = smc->mib.m[MAC0].fddiMACSMTAddress ;
         pd_mac->mac_resource_idx = mac_con_resource_index(smc,1) ;
-        return(len) ;
+        return len;
 }
 
 /*
@@ -1563,7 +1563,7 @@ u_long smt_get_tid(struct s_smc *smc)
         u_long  tid ;
         while ((tid = ++(smc->sm.smt_tid) ^ SMT_TID_MAGIC) == 0)
                 ;
-        return(tid & 0x3fffffffL) ;
+        return tid & 0x3fffffffL;
 }
 
 
@@ -1654,11 +1654,11 @@ int smt_check_para(struct s_smc *smc, struct smt_header	*sm,
         while (*p) {
                 if (!sm_to_para(smc,sm,(int) *p)) {
                         DB_SMT("SMT: smt_check_para - missing para %x\n",*p,0);
-                        return(-1) ;
+                        return -1;
                 }
                 p++ ;
         }
-        return(0) ;
+        return 0;
 }
 
 void *sm_to_para(struct s_smc *smc, struct smt_header *sm, int para)
@@ -1687,7 +1687,7 @@ void *sm_to_para(struct s_smc *smc, struct smt_header *sm, int para)
                         return NULL;
                 }
                 if (found)
-                        return(found) ;
+                        return found;
         }
         return NULL;
 }
@@ -1732,7 +1732,7 @@ char *addr_to_string(struct fddi_addr *addr)
                 string[i * 3 + 2] = ':';
         }
         string[5 * 3 + 2] = 0;
-        return(string);
+        return string;
 }
 #endif
 
@@ -1742,9 +1742,9 @@ int smt_ifconfig(int argc, char *argv[])
         if (argc >= 2 && !strcmp(argv[0],"opt_bypass") &&
             !strcmp(argv[1],"yes")) {
                 smc->mib.fddiSMTBypassPresent = 1 ;
-                return(0) ;
+                return 0;
         }
-        return(amdfddi_config(0,argc,argv)) ;
+        return amdfddi_config(0, argc, argv);
 }
 #endif
 
@@ -1756,9 +1756,9 @@ static int mac_index(struct s_smc *smc, int mac)
         SK_UNUSED(mac) ;
 #ifdef  CONCENTRATOR
         SK_UNUSED(smc) ;
-        return(NUMPHYS+1) ;
+        return NUMPHYS + 1;
 #else
-        return((smc->s.sas == SMT_SAS) ? 2 : 3) ;
+        return (smc->s.sas == SMT_SAS) ? 2 : 3;
 #endif
 }
 
@@ -1768,7 +1768,7 @@ static int mac_index(struct s_smc *smc, int mac)
 static int phy_index(struct s_smc *smc, int phy)
 {
         SK_UNUSED(smc) ;
-        return(phy+1);
+        return phy + 1;
 }
 
 /*
@@ -1779,19 +1779,19 @@ static int mac_con_resource_index(struct s_smc *smc, int mac)
 #ifdef  CONCENTRATOR
         SK_UNUSED(smc) ;
         SK_UNUSED(mac) ;
-        return(entity_to_index(smc,cem_get_downstream(smc,ENTITY_MAC))) ;
+        return entity_to_index(smc, cem_get_downstream(smc, ENTITY_MAC));
 #else
         SK_UNUSED(mac) ;
         switch (smc->mib.fddiSMTCF_State) {
         case SC9_C_WRAP_A :
         case SC5_THRU_B :
         case SC11_C_WRAP_S :
-                return(1) ;
+                return 1;
         case SC10_C_WRAP_B :
         case SC4_THRU_A :
-                return(2) ;
+                return 2;
         }
-        return(smc->s.sas == SMT_SAS ? 2 : 3) ;
+        return smc->s.sas == SMT_SAS ? 2 : 3;
 #endif
 }
 
@@ -1801,21 +1801,21 @@ static int mac_con_resource_index(struct s_smc *smc, int mac)
 static int phy_con_resource_index(struct s_smc *smc, int phy)
 {
 #ifdef  CONCENTRATOR
-        return(entity_to_index(smc,cem_get_downstream(smc,ENTITY_PHY(phy)))) ;
+        return entity_to_index(smc, cem_get_downstream(smc, ENTITY_PHY(phy))) ;
 #else
         switch (smc->mib.fddiSMTCF_State) {
         case SC9_C_WRAP_A :
-                return(phy == PA ? 3 : 2) ;
+                return phy == PA ? 3 : 2;
         case SC10_C_WRAP_B :
-                return(phy == PA ? 1 : 3) ;
+                return phy == PA ? 1 : 3;
         case SC4_THRU_A :
-                return(phy == PA ? 3 : 1) ;
+                return phy == PA ? 3 : 1;
         case SC5_THRU_B :
-                return(phy == PA ? 2 : 3) ;
+                return phy == PA ? 2 : 3;
         case SC11_C_WRAP_S :
-                return(2) ;
+                return 2;
         }
-        return(phy) ;
+        return phy;
 #endif
 }
 
@@ -1823,16 +1823,16 @@ static int phy_con_resource_index(struct s_smc *smc, int phy)
 static int entity_to_index(struct s_smc *smc, int e)
 {
         if (e == ENTITY_MAC)
-                return(mac_index(smc,1)) ;
+                return mac_index(smc, 1);
         else
-                return(phy_index(smc,e - ENTITY_PHY(0))) ;
+                return phy_index(smc, e - ENTITY_PHY(0));
 }
 #endif
 
 #ifdef  LITTLE_ENDIAN
 static int smt_swap_short(u_short s)
 {
-        return(((s>>8)&0xff)|((s&0xff)<<8)) ;
+        return ((s>>8)&0xff) | ((s&0xff)<<8);
 }
 
 void smt_swap_para(struct smt_header *sm, int len, int direction)
@@ -1996,7 +1996,7 @@ int smt_action(struct s_smc *smc, int class, int code, int index)
                         }
                         break ;
                 default :
-                        return(1) ;
+                        return 1;
                 }
                 break ;
         case SMT_PORT_ACTION :
@@ -2017,14 +2017,14 @@ int smt_action(struct s_smc *smc, int class, int code, int index)
                         event = PC_STOP ;
                         break ;
                 default :
-                        return(1) ;
+                        return 1;
                 }
                 queue_event(smc,EVENT_PCM+index,event) ;
                 break ;
         default :
-                return(1) ;
+                return 1;
         }
-        return(0) ;
+        return 0;
 }
 
 /*
diff --git a/drivers/net/skfp/smtdef.c b/drivers/net/skfp/smtdef.c
index 4e07ff7073f1..1acab0b368e3 100644
--- a/drivers/net/skfp/smtdef.c
+++ b/drivers/net/skfp/smtdef.c
@@ -303,7 +303,7 @@ int smt_set_mac_opvalues(struct s_smc *smc)
                         FDDI_SMT_EVENT, (u_long) FDDI_REMOTE_T_REQ,
                         smt_get_event_word(smc));
         }
-        return(st) ;
+        return st;
 }
 
 void smt_fixup_mib(struct s_smc *smc)
@@ -350,6 +350,6 @@ static int set_min_max(int maxflag, u_long mib, u_long limit, u_long *oper)
                 *oper = limit ;
         else
                 *oper = mib ;
-        return(old != *oper) ;
+        return old != *oper;
 }
 
diff --git a/drivers/net/skfp/smtinit.c b/drivers/net/skfp/smtinit.c
index 3c8964ce1837..e3a0c0bc2233 100644
--- a/drivers/net/skfp/smtinit.c
+++ b/drivers/net/skfp/smtinit.c
@@ -120,6 +120,6 @@ int init_smt(struct s_smc *smc, u_char *mac_addr)
 
         PNMI_INIT(smc) ;                /* PNMI initialization */
 
-        return(0) ;
+        return 0;
 }
 
diff --git a/drivers/net/skfp/srf.c b/drivers/net/skfp/srf.c
index 40882b3faba6..f6f7baf9f27a 100644
--- a/drivers/net/skfp/srf.c
+++ b/drivers/net/skfp/srf.c
@@ -165,7 +165,7 @@ static struct s_srf_evc *smt_get_evc(struct s_smc *smc, int code, int index)
 
         for (i = 0, evc = smc->evcs ; (unsigned) i < MAX_EVCS ; i++, evc++) {
                 if (evc->evc_code == code && evc->evc_index == index)
-                        return(evc) ;
+                        return evc;
         }
         return NULL;
 }