ISDN: ARRAY_SIZE changes

These changes were a direct result of using a semantic patch
More information can be found at http://www.emn.fr/x-info/coccinelle/

Modified some of the changes to avoid the extra define.

Signed-off-by: Stoyan Gaydarov <sgayda2@uiuc.edu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>

1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
index 317f16f516f2..9ce6abe05b1a 100644
--- a/drivers/isdn/hisax/isdnl1.c
+++ b/drivers/isdn/hisax/isdnl1.c
@@ -647,8 +647,6 @@ static struct FsmNode L1SFnList[] __initdata =
         {ST_L1_F8, EV_TIMER_DEACT, l1_timer_deact},
 };
 
-#define L1S_FN_COUNT (sizeof(L1SFnList)/sizeof(struct FsmNode))
-
 #ifdef HISAX_UINTERFACE
 static void
 l1_deact_req_u(struct FsmInst *fi, int event, void *arg)
@@ -706,8 +704,6 @@ static struct FsmNode L1UFnList[] __initdata =
         {ST_L1_RESET, EV_TIMER_DEACT, l1_timer_deact},
 };
 
-#define L1U_FN_COUNT (sizeof(L1UFnList)/sizeof(struct FsmNode))
-
 #endif
 
 static void
@@ -754,8 +750,6 @@ static struct FsmNode L1BFnList[] __initdata =
         {ST_L1_WAIT_DEACT, EV_TIMER_DEACT, l1b_timer_deact},
 };
 
-#define L1B_FN_COUNT (sizeof(L1BFnList)/sizeof(struct FsmNode))
-
 int __init 
 Isdnl1New(void)
 {
@@ -765,7 +759,7 @@ Isdnl1New(void)
         l1fsm_s.event_count = L1_EVENT_COUNT;
         l1fsm_s.strEvent = strL1Event;
         l1fsm_s.strState = strL1SState;
-        retval = FsmNew(&l1fsm_s, L1SFnList, L1S_FN_COUNT);
+        retval = FsmNew(&l1fsm_s, L1SFnList, ARRAY_SIZE(L1SFnList));
         if (retval)
                 return retval;
 
@@ -773,7 +767,7 @@ Isdnl1New(void)
         l1fsm_b.event_count = L1_EVENT_COUNT;
         l1fsm_b.strEvent = strL1Event;
         l1fsm_b.strState = strL1BState;
-        retval = FsmNew(&l1fsm_b, L1BFnList, L1B_FN_COUNT);
+        retval = FsmNew(&l1fsm_b, L1BFnList, ARRAY_SIZE(L1BFnList));
         if (retval) {
                 FsmFree(&l1fsm_s);
                 return retval;
@@ -783,7 +777,7 @@ Isdnl1New(void)
         l1fsm_u.event_count = L1_EVENT_COUNT;
         l1fsm_u.strEvent = strL1Event;
         l1fsm_u.strState = strL1UState;
-        retval = FsmNew(&l1fsm_u, L1UFnList, L1U_FN_COUNT);
+        retval = FsmNew(&l1fsm_u, L1UFnList, ARRAY_SIZE(L1UFnList));
         if (retval) {
                 FsmFree(&l1fsm_s);
                 FsmFree(&l1fsm_b);