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>

4 files changed, 73 insertions, 73 deletions

diff --git a/drivers/net/fddi/skfp/fplustm.c b/drivers/net/fddi/skfp/fplustm.c
index f83993590174..d918d8a42667 100644
--- a/drivers/net/fddi/skfp/fplustm.c
+++ b/drivers/net/fddi/skfp/fplustm.c
@@ -55,14 +55,14 @@ static	char cam_warning [] = "E_SMT_004: CAM still busy\n";
 
 #define DUMMY_READ()    smc->hw.mc_dummy = (u_short) inp(ADDR(B0_RAP))
 
-#define CHECK_NPP() {   unsigned k = 10000 ;\
+#define CHECK_NPP() {   unsigned int k = 10000 ;\
                         while ((inpw(FM_A(FM_STMCHN)) & FM_SNPPND) && k) k--;\
                         if (!k) { \
                                 SMT_PANIC(smc,SMT_E0130, SMT_E0130_MSG) ; \
                         }       \
                 }
 
-#define CHECK_CAM() {   unsigned k = 10 ;\
+#define CHECK_CAM() {   unsigned int k = 10 ;\
                         while (!(inpw(FM_A(FM_AFSTAT)) & FM_DONE) && k) k--;\
                         if (!k) { \
                                 SMT_PANIC(smc,SMT_E0131, SMT_E0131_MSG) ; \
@@ -356,25 +356,25 @@ static	void set_formac_addr(struct s_smc *smc)
         long    t_requ = smc->mib.m[MAC0].fddiMACT_Req ;
 
         outpw(FM_A(FM_SAID),my_said) ;  /* set short address */
-        outpw(FM_A(FM_LAIL),(unsigned)((smc->hw.fddi_home_addr.a[4]<<8) +
+        outpw(FM_A(FM_LAIL),(unsigned short)((smc->hw.fddi_home_addr.a[4]<<8) +
                                         smc->hw.fddi_home_addr.a[5])) ;
-        outpw(FM_A(FM_LAIC),(unsigned)((smc->hw.fddi_home_addr.a[2]<<8) +
+        outpw(FM_A(FM_LAIC),(unsigned short)((smc->hw.fddi_home_addr.a[2]<<8) +
                                         smc->hw.fddi_home_addr.a[3])) ;
-        outpw(FM_A(FM_LAIM),(unsigned)((smc->hw.fddi_home_addr.a[0]<<8) +
+        outpw(FM_A(FM_LAIM),(unsigned short)((smc->hw.fddi_home_addr.a[0]<<8) +
                                         smc->hw.fddi_home_addr.a[1])) ;
 
         outpw(FM_A(FM_SAGP),my_sagp) ;  /* set short group address */
 
-        outpw(FM_A(FM_LAGL),(unsigned)((smc->hw.fp.group_addr.a[4]<<8) +
+        outpw(FM_A(FM_LAGL),(unsigned short)((smc->hw.fp.group_addr.a[4]<<8) +
                                         smc->hw.fp.group_addr.a[5])) ;
-        outpw(FM_A(FM_LAGC),(unsigned)((smc->hw.fp.group_addr.a[2]<<8) +
+        outpw(FM_A(FM_LAGC),(unsigned short)((smc->hw.fp.group_addr.a[2]<<8) +
                                         smc->hw.fp.group_addr.a[3])) ;
-        outpw(FM_A(FM_LAGM),(unsigned)((smc->hw.fp.group_addr.a[0]<<8) +
+        outpw(FM_A(FM_LAGM),(unsigned short)((smc->hw.fp.group_addr.a[0]<<8) +
                                         smc->hw.fp.group_addr.a[1])) ;
 
         /* set r_request regs. (MSW & LSW of TRT ) */
-        outpw(FM_A(FM_TREQ1),(unsigned)(t_requ>>16)) ;
-        outpw(FM_A(FM_TREQ0),(unsigned)t_requ) ;
+        outpw(FM_A(FM_TREQ1),(unsigned short)(t_requ>>16)) ;
+        outpw(FM_A(FM_TREQ0),(unsigned short)t_requ) ;
 }
 
 static void set_int(char *p, int l)
@@ -394,10 +394,10 @@ static void set_int(char *p, int l)
  *      append 'end of chain' pointer
  */
 static void copy_tx_mac(struct s_smc *smc, u_long td, struct fddi_mac *mac,
-                        unsigned off, int len)
+                        unsigned int off, int len)
 /* u_long td;            transmit descriptor */
 /* struct fddi_mac *mac; mac frame pointer */
-/* unsigned off;         start address within buffer memory */
+/* unsigned int off;     start address within buffer memory */
 /* int len ;             length of the frame including the FC */
 {
         int     i ;
diff --git a/drivers/net/fddi/skfp/h/supern_2.h b/drivers/net/fddi/skfp/h/supern_2.h
index 0b73690280f6..4ee360d2dc62 100644
--- a/drivers/net/fddi/skfp/h/supern_2.h
+++ b/drivers/net/fddi/skfp/h/supern_2.h
@@ -92,33 +92,33 @@
 union rx_descr {
         struct {
 #ifdef  LITTLE_ENDIAN
-        unsigned        rx_length :16 ; /* frame length lower/upper byte */
-        unsigned        rx_erfbb  :2 ;  /* received frame byte boundary */
-        unsigned        rx_reserv2:2 ;  /* reserved */  
-        unsigned        rx_sfrmty :3 ;  /* frame type bits */
-        unsigned        rx_sadrrg :1 ;  /* DA == MA or broad-/multicast */
-        unsigned        rx_sfrmerr:1 ;  /* received frame not valid */
-        unsigned        rx_seac0  :1 ;  /* frame-copied  C-indicator */
-        unsigned        rx_seac1  :1 ;  /* address-match A-indicator */
-        unsigned        rx_seac2  :1 ;  /* frame-error   E-indicator */
-        unsigned        rx_ssrcrtg:1 ;  /* == 1 SA has MSB set */
-        unsigned        rx_reserv1:1 ;  /* reserved */  
-        unsigned        rx_msrabt :1 ;  /* memory status receive abort */
-        unsigned        rx_msvalid:1 ;  /* memory status valid */
+        unsigned int    rx_length :16 ; /* frame length lower/upper byte */
+        unsigned int    rx_erfbb  :2 ;  /* received frame byte boundary */
+        unsigned int    rx_reserv2:2 ;  /* reserved */
+        unsigned int    rx_sfrmty :3 ;  /* frame type bits */
+        unsigned int    rx_sadrrg :1 ;  /* DA == MA or broad-/multicast */
+        unsigned int    rx_sfrmerr:1 ;  /* received frame not valid */
+        unsigned int    rx_seac0  :1 ;  /* frame-copied  C-indicator */
+        unsigned int    rx_seac1  :1 ;  /* address-match A-indicator */
+        unsigned int    rx_seac2  :1 ;  /* frame-error   E-indicator */
+        unsigned int    rx_ssrcrtg:1 ;  /* == 1 SA has MSB set */
+        unsigned int    rx_reserv1:1 ;  /* reserved */
+        unsigned int    rx_msrabt :1 ;  /* memory status receive abort */
+        unsigned int    rx_msvalid:1 ;  /* memory status valid */
 #else
-        unsigned        rx_msvalid:1 ;  /* memory status valid */
-        unsigned        rx_msrabt :1 ;  /* memory status receive abort */
-        unsigned        rx_reserv1:1 ;  /* reserved */  
-        unsigned        rx_ssrcrtg:1 ;  /* == 1 SA has MSB set */
-        unsigned        rx_seac2  :1 ;  /* frame-error   E-indicator */
-        unsigned        rx_seac1  :1 ;  /* address-match A-indicator */
-        unsigned        rx_seac0  :1 ;  /* frame-copied  C-indicator */
-        unsigned        rx_sfrmerr:1 ;  /* received frame not valid */
-        unsigned        rx_sadrrg :1 ;  /* DA == MA or broad-/multicast */
-        unsigned        rx_sfrmty :3 ;  /* frame type bits */
-        unsigned        rx_erfbb  :2 ;  /* received frame byte boundary */
-        unsigned        rx_reserv2:2 ;  /* reserved */  
-        unsigned        rx_length :16 ; /* frame length lower/upper byte */
+        unsigned int    rx_msvalid:1 ;  /* memory status valid */
+        unsigned int    rx_msrabt :1 ;  /* memory status receive abort */
+        unsigned int    rx_reserv1:1 ;  /* reserved */
+        unsigned int    rx_ssrcrtg:1 ;  /* == 1 SA has MSB set */
+        unsigned int    rx_seac2  :1 ;  /* frame-error   E-indicator */
+        unsigned int    rx_seac1  :1 ;  /* address-match A-indicator */
+        unsigned int    rx_seac0  :1 ;  /* frame-copied  C-indicator */
+        unsigned int    rx_sfrmerr:1 ;  /* received frame not valid */
+        unsigned int    rx_sadrrg :1 ;  /* DA == MA or broad-/multicast */
+        unsigned int    rx_sfrmty :3 ;  /* frame type bits */
+        unsigned int    rx_erfbb  :2 ;  /* received frame byte boundary */
+        unsigned int    rx_reserv2:2 ;  /* reserved */
+        unsigned int    rx_length :16 ; /* frame length lower/upper byte */
 #endif
         } r ;
         long    i ;
@@ -162,23 +162,23 @@ union rx_descr {
 union tx_descr {
         struct {
 #ifdef  LITTLE_ENDIAN
-        unsigned        tx_length:16 ;  /* frame length lower/upper byte */
-        unsigned        tx_res   :8 ;   /* reserved      (bit 16..23) */
-        unsigned        tx_xmtabt:1 ;   /* transmit abort */
-        unsigned        tx_nfcs  :1 ;   /* no frame check sequence */
-        unsigned        tx_xdone :1 ;   /* give up token */
-        unsigned        tx_rpxm  :2 ;   /* byte offset */
-        unsigned        tx_pat1  :2 ;   /* must be TXP1 */
-        unsigned        tx_more  :1 ;   /* more frame in chain */
+        unsigned int    tx_length:16 ;  /* frame length lower/upper byte */
+        unsigned int    tx_res   :8 ;   /* reserved      (bit 16..23) */
+        unsigned int    tx_xmtabt:1 ;   /* transmit abort */
+        unsigned int    tx_nfcs  :1 ;   /* no frame check sequence */
+        unsigned int    tx_xdone :1 ;   /* give up token */
+        unsigned int    tx_rpxm  :2 ;   /* byte offset */
+        unsigned int    tx_pat1  :2 ;   /* must be TXP1 */
+        unsigned int    tx_more  :1 ;   /* more frame in chain */
 #else
-        unsigned        tx_more  :1 ;   /* more frame in chain */
-        unsigned        tx_pat1  :2 ;   /* must be TXP1 */
-        unsigned        tx_rpxm  :2 ;   /* byte offset */
-        unsigned        tx_xdone :1 ;   /* give up token */
-        unsigned        tx_nfcs  :1 ;   /* no frame check sequence */
-        unsigned        tx_xmtabt:1 ;   /* transmit abort */
+        unsigned int    tx_more  :1 ;   /* more frame in chain */
+        unsigned int    tx_pat1  :2 ;   /* must be TXP1 */
+        unsigned int    tx_rpxm  :2 ;   /* byte offset */
+        unsigned int    tx_xdone :1 ;   /* give up token */
+        unsigned int    tx_nfcs  :1 ;   /* no frame check sequence */
+        unsigned int    tx_xmtabt:1 ;   /* transmit abort */