diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-23 01:40:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-26 21:34:29 -0400 |
commit | 807540baae406c84dcb9c1c8ef07a56d2d2ae84a (patch) | |
tree | ccd5c2cb57710dd6b73cf8df11eedf67abc14ae4 /drivers/net/skfp/fplustm.c | |
parent | cb4dfe562cac6fcb544df752e40c1d78000d0712 (diff) |
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>
Diffstat (limited to 'drivers/net/skfp/fplustm.c')
-rw-r--r-- | drivers/net/skfp/fplustm.c | 24 |
1 files changed, 12 insertions, 12 deletions
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) | |||
112 | u_long tneg ; | 112 | u_long tneg ; |
113 | 113 | ||
114 | tneg = (u_long)((long)inpw(FM_A(FM_TNEG))<<5) ; | 114 | tneg = (u_long)((long)inpw(FM_A(FM_TNEG))<<5) ; |
115 | return((u_long)((tneg + ((inpw(FM_A(FM_TMRS))>>10)&0x1f)) | | 115 | return (u_long)((tneg + ((inpw(FM_A(FM_TMRS))>>10)&0x1f)) | |
116 | 0xffe00000L)) ; | 116 | 0xffe00000L) ; |
117 | } | 117 | } |
118 | 118 | ||
119 | void mac_update_counter(struct s_smc *smc) | 119 | void mac_update_counter(struct s_smc *smc) |
@@ -163,7 +163,7 @@ static u_long read_mdr(struct s_smc *smc, unsigned int addr) | |||
163 | /* is used */ | 163 | /* is used */ |
164 | p = (u_long)inpw(FM_A(FM_MDRU))<<16 ; | 164 | p = (u_long)inpw(FM_A(FM_MDRU))<<16 ; |
165 | p += (u_long)inpw(FM_A(FM_MDRL)) ; | 165 | p += (u_long)inpw(FM_A(FM_MDRL)) ; |
166 | return(p) ; | 166 | return p; |
167 | } | 167 | } |
168 | #endif | 168 | #endif |
169 | 169 | ||
@@ -887,7 +887,7 @@ int init_fplus(struct s_smc *smc) | |||
887 | /* make sure all PCI settings are correct */ | 887 | /* make sure all PCI settings are correct */ |
888 | mac_do_pci_fix(smc) ; | 888 | mac_do_pci_fix(smc) ; |
889 | 889 | ||
890 | return(init_mac(smc,1)) ; | 890 | return init_mac(smc, 1); |
891 | /* enable_formac(smc) ; */ | 891 | /* enable_formac(smc) ; */ |
892 | } | 892 | } |
893 | 893 | ||
@@ -989,7 +989,7 @@ static int init_mac(struct s_smc *smc, int all) | |||
989 | } | 989 | } |
990 | smc->hw.hw_state = STARTED ; | 990 | smc->hw.hw_state = STARTED ; |
991 | 991 | ||
992 | return(0) ; | 992 | return 0; |
993 | } | 993 | } |
994 | 994 | ||
995 | 995 | ||
@@ -1049,7 +1049,7 @@ void sm_ma_control(struct s_smc *smc, int mode) | |||
1049 | 1049 | ||
1050 | int sm_mac_get_tx_state(struct s_smc *smc) | 1050 | int sm_mac_get_tx_state(struct s_smc *smc) |
1051 | { | 1051 | { |
1052 | return((inpw(FM_A(FM_STMCHN))>>4)&7) ; | 1052 | return (inpw(FM_A(FM_STMCHN))>>4) & 7; |
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | /* | 1055 | /* |
@@ -1084,9 +1084,9 @@ static struct s_fpmc* mac_get_mc_table(struct s_smc *smc, | |||
1084 | } | 1084 | } |
1085 | if (memcmp((char *)&tb->a,(char *)own,6)) | 1085 | if (memcmp((char *)&tb->a,(char *)own,6)) |
1086 | continue ; | 1086 | continue ; |
1087 | return(tb) ; | 1087 | return tb; |
1088 | } | 1088 | } |
1089 | return(slot) ; /* return first free or NULL */ | 1089 | return slot; /* return first free or NULL */ |
1090 | } | 1090 | } |
1091 | 1091 | ||
1092 | /* | 1092 | /* |
@@ -1152,12 +1152,12 @@ int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can) | |||
1152 | */ | 1152 | */ |
1153 | if (can & 0x80) { | 1153 | if (can & 0x80) { |
1154 | if (smc->hw.fp.smt_slots_used >= SMT_MAX_MULTI) { | 1154 | if (smc->hw.fp.smt_slots_used >= SMT_MAX_MULTI) { |
1155 | return(1) ; | 1155 | return 1; |
1156 | } | 1156 | } |
1157 | } | 1157 | } |
1158 | else { | 1158 | else { |
1159 | if (smc->hw.fp.os_slots_used >= FPMAX_MULTICAST-SMT_MAX_MULTI) { | 1159 | if (smc->hw.fp.os_slots_used >= FPMAX_MULTICAST-SMT_MAX_MULTI) { |
1160 | return(1) ; | 1160 | return 1; |
1161 | } | 1161 | } |
1162 | } | 1162 | } |
1163 | 1163 | ||
@@ -1165,7 +1165,7 @@ int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can) | |||
1165 | * find empty slot | 1165 | * find empty slot |
1166 | */ | 1166 | */ |
1167 | if (!(tb = mac_get_mc_table(smc,addr,&own,0,can & ~0x80))) | 1167 | if (!(tb = mac_get_mc_table(smc,addr,&own,0,can & ~0x80))) |
1168 | return(1) ; | 1168 | return 1; |
1169 | tb->n++ ; | 1169 | tb->n++ ; |
1170 | tb->a = own ; | 1170 | tb->a = own ; |
1171 | tb->perm = (can & 0x80) ? 1 : 0 ; | 1171 | tb->perm = (can & 0x80) ? 1 : 0 ; |
@@ -1175,7 +1175,7 @@ int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can) | |||
1175 | else | 1175 | else |
1176 | smc->hw.fp.os_slots_used++ ; | 1176 | smc->hw.fp.os_slots_used++ ; |
1177 | 1177 | ||
1178 | return(0) ; | 1178 | return 0; |
1179 | } | 1179 | } |
1180 | 1180 | ||
1181 | /* | 1181 | /* |