Use macros that don't require fixed argument counts so
format and arguments can be verified by the compiler.
Miscellanea:
o Remove a few #if uses to allow dynamic debug to always work
o whitespace neatening
Signed-off-by: Joe Perches j...@perches.com
---
drivers/net/fddi/skfp/cfm.c| 16 +++
drivers/net/fddi/skfp/drvfbi.c | 2 +-
drivers/net/fddi/skfp/ecm.c| 16 +++
drivers/net/fddi/skfp/ess.c| 51 ++--
drivers/net/fddi/skfp/fplustm.c| 10 ++--
drivers/net/fddi/skfp/h/cmtdef.h | 95 +-
drivers/net/fddi/skfp/h/osdef1st.h | 2 +
drivers/net/fddi/skfp/pcmplc.c | 29 ++--
drivers/net/fddi/skfp/pmf.c| 2 +-
drivers/net/fddi/skfp/rmt.c| 28 ++-
drivers/net/fddi/skfp/smt.c| 72 ++---
drivers/net/fddi/skfp/srf.c| 12 ++---
12 files changed, 179 insertions(+), 156 deletions(-)
diff --git a/drivers/net/fddi/skfp/cfm.c b/drivers/net/fddi/skfp/cfm.c
index e395ace..e2fab03 100644
--- a/drivers/net/fddi/skfp/cfm.c
+++ b/drivers/net/fddi/skfp/cfm.c
@@ -52,7 +52,6 @@ static const char ID_sccs[] = @(#)cfm.c 2.18 98/10/06
(C) SK ;
#define ACTIONS_DONE() (smc-mib.fddiSMTCF_State = ~AFLAG)
#define ACTIONS(x) (x|AFLAG)
-#ifdef DEBUG
/*
* symbolic state names
*/
@@ -68,7 +67,6 @@ static const char * const cfm_states[] = {
static const char * const cfm_events[] = {
NONE,CF_LOOP_A,CF_LOOP_B,CF_JOIN_A,CF_JOIN_B
} ;
-#endif
/*
* map from state to downstream port type
@@ -233,7 +231,7 @@ void cfm(struct s_smc *smc, int event)
DB_CFM(CFM : state %s%s,
(smc-mib.fddiSMTCF_State AFLAG) ? ACTIONS : ,
cfm_states[smc-mib.fddiSMTCF_State ~AFLAG]) ;
- DB_CFM( event %s\n,cfm_events[event],0) ;
+ DB_CFM( event %s\n, cfm_events[event]);
state = smc-mib.fddiSMTCF_State ;
cfm_fsm(smc,event) ;
event = 0 ;
@@ -297,7 +295,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)
queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */
/* Don't do the WC-Flag changing here */
ACTIONS_DONE() ;
- DB_CFMN(1,CFM : %s\n,cfm_states[smc-mib.fddiSMTCF_State],0) ;
+ DB_CFMN(1, CFM : %s\n, cfm_states[smc-mib.fddiSMTCF_State]);
break;
case SC0_ISOLATED :
/*SC07*/
@@ -338,7 +336,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)
queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */
}
ACTIONS_DONE() ;
- DB_CFMN(1,CFM : %s\n,cfm_states[smc-mib.fddiSMTCF_State],0) ;
+ DB_CFMN(1, CFM : %s\n, cfm_states[smc-mib.fddiSMTCF_State]);
break ;
case SC9_C_WRAP_A :
/*SC10*/
@@ -403,7 +401,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)
queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */
}
ACTIONS_DONE() ;
- DB_CFMN(1,CFM : %s\n,cfm_states[smc-mib.fddiSMTCF_State],0) ;
+ DB_CFMN(1, CFM : %s\n, cfm_states[smc-mib.fddiSMTCF_State]);
break ;
case SC10_C_WRAP_B :
/*SC20*/
@@ -448,7 +446,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)
smc-r.rm_join = TRUE ;
queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */
ACTIONS_DONE() ;
- DB_CFMN(1,CFM : %s\n,cfm_states[smc-mib.fddiSMTCF_State],0) ;
+ DB_CFMN(1, CFM : %s\n, cfm_states[smc-mib.fddiSMTCF_State]);
break ;
case SC4_THRU_A :
/*SC41*/
@@ -481,7 +479,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)
smc-r.rm_join = TRUE ;
queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */
ACTIONS_DONE() ;
- DB_CFMN(1,CFM : %s\n,cfm_states[smc-mib.fddiSMTCF_State],0) ;
+ DB_CFMN(1, CFM : %s\n, cfm_states[smc-mib.fddiSMTCF_State]);
break ;
case SC5_THRU_B :
/*SC51*/
@@ -519,7 +517,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)
queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */
}
ACTIONS_DONE() ;
- DB_CFMN(1,CFM : %s\n,cfm_states[smc-mib.fddiSMTCF_State],0) ;
+ DB_CFMN(1, CFM : %s\n, cfm_states[smc-mib.fddiSMTCF_State]);
break ;
case SC11_C_WRAP_S :
/*SC70*/
diff --git a/drivers/net/fddi/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c
index 07da97c..6f85461 100644
--- a/drivers/net/fddi/skfp/drvfbi.c
+++ b/drivers/net/fddi/skfp/drvfbi.c
@@ -344,7 +344,7 @@ void init_board(struct s_smc *smc, u_char *mac_addr)
void sm_pm_bypass_req(struct s_smc *smc, int mode)
{