mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-23 05:56:14 -04:00
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>
This commit is contained in:
committed by
David S. Miller
parent
d3fbccf2b0
commit
89e47d3b8a
@@ -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 ;
|
||||
|
||||
Reference in New Issue
Block a user