Skip to content

Commit 89e47d3

Browse files
t00214307davem330
t00214307
authored and
davem330
committed
fddi: cleanup unsigned to unsigned int/short
Use "unsigned int/short" instead of "unsigned", and change the type of iteration variable "i" to "unsigned int". Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent d3fbccf commit 89e47d3

File tree

4 files changed

+73
-73
lines changed

4 files changed

+73
-73
lines changed

‎drivers/net/fddi/skfp/fplustm.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ static char cam_warning [] = "E_SMT_004: CAM still busy\n";
5555

5656
#define DUMMY_READ() smc->hw.mc_dummy = (u_short) inp(ADDR(B0_RAP))
5757

58-
#define CHECK_NPP() { unsigned k = 10000 ;\
58+
#define CHECK_NPP() { unsigned int k = 10000 ;\
5959
while ((inpw(FM_A(FM_STMCHN)) & FM_SNPPND) && k) k--;\
6060
if (!k) { \
6161
SMT_PANIC(smc,SMT_E0130, SMT_E0130_MSG) ; \
6262
} \
6363
}
6464

65-
#define CHECK_CAM() { unsigned k = 10 ;\
65+
#define CHECK_CAM() { unsigned int k = 10 ;\
6666
while (!(inpw(FM_A(FM_AFSTAT)) & FM_DONE) && k) k--;\
6767
if (!k) { \
6868
SMT_PANIC(smc,SMT_E0131, SMT_E0131_MSG) ; \
@@ -356,25 +356,25 @@ static void set_formac_addr(struct s_smc *smc)
356356
long t_requ = smc->mib.m[MAC0].fddiMACT_Req ;
357357

358358
outpw(FM_A(FM_SAID),my_said) ; /* set short address */
359-
outpw(FM_A(FM_LAIL),(unsigned)((smc->hw.fddi_home_addr.a[4]<<8) +
359+
outpw(FM_A(FM_LAIL),(unsigned short)((smc->hw.fddi_home_addr.a[4]<<8) +
360360
smc->hw.fddi_home_addr.a[5])) ;
361-
outpw(FM_A(FM_LAIC),(unsigned)((smc->hw.fddi_home_addr.a[2]<<8) +
361+
outpw(FM_A(FM_LAIC),(unsigned short)((smc->hw.fddi_home_addr.a[2]<<8) +
362362
smc->hw.fddi_home_addr.a[3])) ;
363-
outpw(FM_A(FM_LAIM),(unsigned)((smc->hw.fddi_home_addr.a[0]<<8) +
363+
outpw(FM_A(FM_LAIM),(unsigned short)((smc->hw.fddi_home_addr.a[0]<<8) +
364364
smc->hw.fddi_home_addr.a[1])) ;
365365

366366
outpw(FM_A(FM_SAGP),my_sagp) ; /* set short group address */
367367

368-
outpw(FM_A(FM_LAGL),(unsigned)((smc->hw.fp.group_addr.a[4]<<8) +
368+
outpw(FM_A(FM_LAGL),(unsigned short)((smc->hw.fp.group_addr.a[4]<<8) +
369369
smc->hw.fp.group_addr.a[5])) ;
370-
outpw(FM_A(FM_LAGC),(unsigned)((smc->hw.fp.group_addr.a[2]<<8) +
370+
outpw(FM_A(FM_LAGC),(unsigned short)((smc->hw.fp.group_addr.a[2]<<8) +
371371
smc->hw.fp.group_addr.a[3])) ;
372-
outpw(FM_A(FM_LAGM),(unsigned)((smc->hw.fp.group_addr.a[0]<<8) +
372+
outpw(FM_A(FM_LAGM),(unsigned short)((smc->hw.fp.group_addr.a[0]<<8) +
373373
smc->hw.fp.group_addr.a[1])) ;
374374

375375
/* set r_request regs. (MSW & LSW of TRT ) */
376-
outpw(FM_A(FM_TREQ1),(unsigned)(t_requ>>16)) ;
377-
outpw(FM_A(FM_TREQ0),(unsigned)t_requ) ;
376+
outpw(FM_A(FM_TREQ1),(unsigned short)(t_requ>>16)) ;
377+
outpw(FM_A(FM_TREQ0),(unsigned short)t_requ) ;
378378
}
379379

380380
static void set_int(char *p, int l)
@@ -394,10 +394,10 @@ static void set_int(char *p, int l)
394394
* append 'end of chain' pointer
395395
*/
396396
static void copy_tx_mac(struct s_smc *smc, u_long td, struct fddi_mac *mac,
397-
unsigned off, int len)
397+
unsigned int off, int len)
398398
/* u_long td; transmit descriptor */
399399
/* struct fddi_mac *mac; mac frame pointer */
400-
/* unsigned off; start address within buffer memory */
400+
/* unsigned int off; start address within buffer memory */
401401
/* int len ; length of the frame including the FC */
402402
{
403403
int i ;

‎drivers/net/fddi/skfp/h/supern_2.h

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -92,33 +92,33 @@
9292
union rx_descr {
9393
struct {
9494
#ifdef LITTLE_ENDIAN
95-
unsigned rx_length :16 ; /* frame length lower/upper byte */
96-
unsigned rx_erfbb :2 ; /* received frame byte boundary */
97-
unsigned rx_reserv2:2 ; /* reserved */
98-
unsigned rx_sfrmty :3 ; /* frame type bits */
99-
unsigned rx_sadrrg :1 ; /* DA == MA or broad-/multicast */
100-
unsigned rx_sfrmerr:1 ; /* received frame not valid */
101-
unsigned rx_seac0 :1 ; /* frame-copied C-indicator */
102-
unsigned rx_seac1 :1 ; /* address-match A-indicator */
103-
unsigned rx_seac2 :1 ; /* frame-error E-indicator */
104-
unsigned rx_ssrcrtg:1 ; /* == 1 SA has MSB set */
105-
unsigned rx_reserv1:1 ; /* reserved */
106-
unsigned rx_msrabt :1 ; /* memory status receive abort */
107-
unsigned rx_msvalid:1 ; /* memory status valid */
95+
unsigned int rx_length :16 ; /* frame length lower/upper byte */
96+
unsigned int rx_erfbb :2 ; /* received frame byte boundary */
97+
unsigned int rx_reserv2:2 ; /* reserved */
98+
unsigned int rx_sfrmty :3 ; /* frame type bits */
99+
unsigned int rx_sadrrg :1 ; /* DA == MA or broad-/multicast */
100+
unsigned int rx_sfrmerr:1 ; /* received frame not valid */
101+
unsigned int rx_seac0 :1 ; /* frame-copied C-indicator */
102+
unsigned int rx_seac1 :1 ; /* address-match A-indicator */
103+
unsigned int rx_seac2 :1 ; /* frame-error E-indicator */
104+
unsigned int rx_ssrcrtg:1 ; /* == 1 SA has MSB set */
105+
unsigned int rx_reserv1:1 ; /* reserved */
106+
unsigned int rx_msrabt :1 ; /* memory status receive abort */
107+
unsigned int rx_msvalid:1 ; /* memory status valid */
108108
#else
109-
unsigned rx_msvalid:1 ; /* memory status valid */
110-
unsigned rx_msrabt :1 ; /* memory status receive abort */
111-
unsigned rx_reserv1:1 ; /* reserved */
112-
unsigned rx_ssrcrtg:1 ; /* == 1 SA has MSB set */
113-
unsigned rx_seac2 :1 ; /* frame-error E-indicator */
114-
unsigned rx_seac1 :1 ; /* address-match A-indicator */
115-
unsigned rx_seac0 :1 ; /* frame-copied C-indicator */
116-
unsigned rx_sfrmerr:1 ; /* received frame not valid */
117-
unsigned rx_sadrrg :1 ; /* DA == MA or broad-/multicast */
118-
unsigned rx_sfrmty :3 ; /* frame type bits */
119-
unsigned rx_erfbb :2 ; /* received frame byte boundary */
120-
unsigned rx_reserv2:2 ; /* reserved */
121-
unsigned rx_length :16 ; /* frame length lower/upper byte */
109+
unsigned int rx_msvalid:1 ; /* memory status valid */
110+
unsigned int rx_msrabt :1 ; /* memory status receive abort */
111+
unsigned int rx_reserv1:1 ; /* reserved */
112+
unsigned int rx_ssrcrtg:1 ; /* == 1 SA has MSB set */
113+
unsigned int rx_seac2 :1 ; /* frame-error E-indicator */
114+
unsigned int rx_seac1 :1 ; /* address-match A-indicator */
115+
unsigned int rx_seac0 :1 ; /* frame-copied C-indicator */
116+
unsigned int rx_sfrmerr:1 ; /* received frame not valid */
117+
unsigned int rx_sadrrg :1 ; /* DA == MA or broad-/multicast */
118+
unsigned int rx_sfrmty :3 ; /* frame type bits */
119+
unsigned int rx_erfbb :2 ; /* received frame byte boundary */
120+
unsigned int rx_reserv2:2 ; /* reserved */
121+
unsigned int rx_length :16 ; /* frame length lower/upper byte */
122122
#endif
123123
} r ;
124124
long i ;
@@ -162,23 +162,23 @@ union rx_descr {
162162
union tx_descr {
163163
struct {
164164
#ifdef LITTLE_ENDIAN
165-
unsigned tx_length:16 ; /* frame length lower/upper byte */
166-
unsigned tx_res :8 ; /* reserved (bit 16..23) */
167-
unsigned tx_xmtabt:1 ; /* transmit abort */
168-
unsigned tx_nfcs :1 ; /* no frame check sequence */
169-
unsigned tx_xdone :1 ; /* give up token */
170-
unsigned tx_rpxm :2 ; /* byte offset */
171-
unsigned tx_pat1 :2 ; /* must be TXP1 */
172-
unsigned tx_more :1 ; /* more frame in chain */
165+
unsigned int tx_length:16 ; /* frame length lower/upper byte */
166+
unsigned int tx_res :8 ; /* reserved (bit 16..23) */
167+
unsigned int tx_xmtabt:1 ; /* transmit abort */
168+
unsigned int tx_nfcs :1 ; /* no frame check sequence */
169+
unsigned int tx_xdone :1 ; /* give up token */
170+
unsigned int tx_rpxm :2 ; /* byte offset */
171+
unsigned int tx_pat1 :2 ; /* must be TXP1 */
172+
unsigned int tx_more :1 ; /* more frame in chain */
173173
#else
174-
unsigned tx_more :1 ; /* more frame in chain */
175-
unsigned tx_pat1 :2 ; /* must be TXP1 */
176-
unsigned tx_rpxm :2 ; /* byte offset */
177-
unsigned tx_xdone :1 ; /* give up token */
178-
unsigned tx_nfcs :1 ; /* no frame check sequence */
179-
unsigned tx_xmtabt:1 ; /* transmit abort */
180-
unsigned tx_res :8 ; /* reserved (bit 16..23) */
181-
unsigned tx_length:16 ; /* frame length lower/upper byte */
174+
unsigned int tx_more :1 ; /* more frame in chain */
175+
unsigned int tx_pat1 :2 ; /* must be TXP1 */
176+
unsigned int tx_rpxm :2 ; /* byte offset */
177+
unsigned int tx_xdone :1 ; /* give up token */
178+
unsigned int tx_nfcs :1 ; /* no frame check sequence */
179+
unsigned int tx_xmtabt:1 ; /* transmit abort */
180+
unsigned int tx_res :8 ; /* reserved (bit 16..23) */
181+
unsigned int tx_length:16 ; /* frame length lower/upper byte */
182182
#endif
183183
} t ;
184184
long i ;
@@ -202,13 +202,13 @@ union tx_descr {
202202
union tx_pointer {
203203
struct t {
204204
#ifdef LITTLE_ENDIAN
205-
unsigned tp_pointer:16 ; /* pointer to tx_descr (low/high) */
206-
unsigned tp_res :8 ; /* reserved (bit 16..23) */
207-
unsigned tp_pattern:8 ; /* fixed pattern (bit 24..31) */
205+
unsigned int tp_pointer:16 ; /* pointer to tx_descr (low/high) */
206+
unsigned int tp_res :8 ; /* reserved (bit 16..23) */
207+
unsigned int tp_pattern:8 ; /* fixed pattern (bit 24..31) */
208208
#else
209-
unsigned tp_pattern:8 ; /* fixed pattern (bit 24..31) */
210-
unsigned tp_res :8 ; /* reserved (bit 16..23) */
211-
unsigned tp_pointer:16 ; /* pointer to tx_descr (low/high) */
209+
unsigned int tp_pattern:8 ; /* fixed pattern (bit 24..31) */
210+
unsigned int tp_res :8 ; /* reserved (bit 16..23) */
211+
unsigned int tp_pointer:16 ; /* pointer to tx_descr (low/high) */
212212
#endif
213213
} t ;
214214
long i ;

‎drivers/net/fddi/skfp/smt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ static void smt_send_rdf(struct s_smc *smc, SMbuf *rej, int fc, int reason,
900900
rdf->version.v_pad2 = 0 ;
901901

902902
/* set P13 */
903-
if ((unsigned) frame_len <= SMT_MAX_INFO_LEN - sizeof(*rdf) +
903+
if ((unsigned int) frame_len <= SMT_MAX_INFO_LEN - sizeof(*rdf) +
904904
2*sizeof(struct smt_header))
905905
len = frame_len ;
906906
else

‎drivers/net/fddi/skfp/srf.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void smt_init_evc(struct s_smc *smc)
7373
{
7474
struct s_srf_evc *evc ;
7575
const struct evc_init *init ;
76-
int i ;
76+
unsigned int i ;
7777
int index ;
7878
int offset ;
7979

@@ -84,7 +84,7 @@ void smt_init_evc(struct s_smc *smc)
8484
evc = smc->evcs ;
8585
init = evc_inits ;
8686

87-
for (i = 0 ; (unsigned) i < MAX_INIT_EVC ; i++) {
87+
for (i = 0 ; i < MAX_INIT_EVC ; i++) {
8888
for (index = 0 ; index < init->n ; index++) {
8989
evc->evc_code = init->code ;
9090
evc->evc_para = init->para ;
@@ -98,7 +98,7 @@ void smt_init_evc(struct s_smc *smc)
9898
init++ ;
9999
}
100100

101-
if ((unsigned) (evc - smc->evcs) > MAX_EVCS) {
101+
if ((unsigned int) (evc - smc->evcs) > MAX_EVCS) {
102102
SMT_PANIC(smc,SMT_E0127, SMT_E0127_MSG) ;
103103
}
104104

@@ -139,7 +139,7 @@ void smt_init_evc(struct s_smc *smc)
139139
offset++ ;
140140
}
141141
#ifdef DEBUG
142-
for (i = 0, evc = smc->evcs ; (unsigned) i < MAX_EVCS ; i++, evc++) {
142+
for (i = 0, evc = smc->evcs ; i < MAX_EVCS ; i++, evc++) {
143143
if (SMT_IS_CONDITION(evc->evc_code)) {
144144
if (!evc->evc_cond_state) {
145145
SMT_PANIC(smc,SMT_E0128, SMT_E0128_MSG) ;
@@ -160,10 +160,10 @@ void smt_init_evc(struct s_smc *smc)
160160

161161
static struct s_srf_evc *smt_get_evc(struct s_smc *smc, int code, int index)
162162
{
163-
int i ;
163+
unsigned int i ;
164164
struct s_srf_evc *evc ;
165165

166-
for (i = 0, evc = smc->evcs ; (unsigned) i < MAX_EVCS ; i++, evc++) {
166+
for (i = 0, evc = smc->evcs ; i < MAX_EVCS ; i++, evc++) {
167167
if (evc->evc_code == code && evc->evc_index == index)
168168
return evc;
169169
}
@@ -335,9 +335,9 @@ void smt_srf_event(struct s_smc *smc, int code, int index, int cond)
335335
static void clear_all_rep(struct s_smc *smc)
336336
{
337337
struct s_srf_evc *evc ;
338-
int i ;
338+
unsigned int i ;
339339

340-
for (i = 0, evc = smc->evcs ; (unsigned) i < MAX_EVCS ; i++, evc++) {
340+
for (i = 0, evc = smc->evcs ; i < MAX_EVCS ; i++, evc++) {
341341
evc->evc_rep_required = FALSE ;
342342
if (SMT_IS_CONDITION(evc->evc_code))
343343
*evc->evc_cond_state = FALSE ;
@@ -348,10 +348,10 @@ static void clear_all_rep(struct s_smc *smc)
348348
static void clear_reported(struct s_smc *smc)
349349
{
350350
struct s_srf_evc *evc ;
351-
int i ;
351+
unsigned int i ;
352352

353353
smc->srf.any_report = FALSE ;
354-
for (i = 0, evc = smc->evcs ; (unsigned) i < MAX_EVCS ; i++, evc++) {
354+
for (i = 0, evc = smc->evcs ; i < MAX_EVCS ; i++, evc++) {
355355
if (SMT_IS_CONDITION(evc->evc_code)) {
356356
if (*evc->evc_cond_state == FALSE)
357357
evc->evc_rep_required = FALSE ;
@@ -375,7 +375,7 @@ static void smt_send_srf(struct s_smc *smc)
375375
struct s_srf_evc *evc ;
376376
SK_LOC_DECL(struct s_pcon,pcon) ;
377377
SMbuf *mb ;
378-
int i ;
378+
unsigned int i ;
379379

380380
static const struct fddi_addr SMT_SRF_DA = {
381381
{ 0x80, 0x01, 0x43, 0x00, 0x80, 0x08 }
@@ -405,7 +405,7 @@ static void smt_send_srf(struct s_smc *smc)
405405
smt_add_para(smc,&pcon,(u_short) SMT_P1033,0,0) ;
406406
smt_add_para(smc,&pcon,(u_short) SMT_P1034,0,0) ;
407407

408-
for (i = 0, evc = smc->evcs ; (unsigned) i < MAX_EVCS ; i++, evc++) {
408+
for (i = 0, evc = smc->evcs ; i < MAX_EVCS ; i++, evc++) {
409409
if (evc->evc_rep_required) {
410410
smt_add_para(smc,&pcon,evc->evc_para,
411411
(int)evc->evc_index,0) ;

0 commit comments

Comments
 (0)