1 files changed, 6 insertions, 14 deletions

diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c
index c5c36eeff261..b0554f80bfb3 100644
--- a/drivers/isdn/hisax/l3_1tr6.c
+++ b/drivers/isdn/hisax/l3_1tr6.c
@@ -698,9 +698,6 @@ static struct stateentry downstl[] =
          CC_T308_2, l3_1tr6_t308_2},
 };
 
-#define DOWNSTL_LEN \
-        (sizeof(downstl) / sizeof(struct stateentry))
-
 static struct stateentry datastln1[] =
 {
         {SBIT(0),
@@ -735,9 +732,6 @@ static struct stateentry datastln1[] =
          MT_N1_REL_ACK, l3_1tr6_rel_ack}
 };
 
-#define DATASTLN1_LEN \
-        (sizeof(datastln1) / sizeof(struct stateentry))
-
 static struct stateentry manstatelist[] =
 {
         {SBIT(2),
@@ -746,8 +740,6 @@ static struct stateentry manstatelist[] =
          DL_RELEASE | INDICATION, l3_1tr6_dl_release},
 };
  
-#define MANSLLEN \
-        (sizeof(manstatelist) / sizeof(struct stateentry))
 /* *INDENT-ON* */
 
 static void
@@ -840,11 +832,11 @@ up1tr6(struct PStack *st, int pr, void *arg)
                                 mt = MT_N1_INVALID;
                         }
                 }
-                for (i = 0; i < DATASTLN1_LEN; i++)
+                for (i = 0; i < ARRAY_SIZE(datastln1); i++)
                         if ((mt == datastln1[i].primitive) &&
                             ((1 << proc->state) & datastln1[i].state))
                                 break;
-                if (i == DATASTLN1_LEN) {
+                if (i == ARRAY_SIZE(datastln1)) {
                         dev_kfree_skb(skb);
                         if (st->l3.debug & L3_DEB_STATE) {
                                 sprintf(tmp, "up1tr6%sstate %d mt %x unhandled",
@@ -892,11 +884,11 @@ down1tr6(struct PStack *st, int pr, void *arg)
                 proc = arg;
         }
 
-        for (i = 0; i < DOWNSTL_LEN; i++)
+        for (i = 0; i < ARRAY_SIZE(downstl); i++)
                 if ((pr == downstl[i].primitive) &&
                     ((1 << proc->state) & downstl[i].state))
                         break;
-        if (i == DOWNSTL_LEN) {
+        if (i == ARRAY_SIZE(downstl)) {
                 if (st->l3.debug & L3_DEB_STATE) {
                         sprintf(tmp, "down1tr6 state %d prim %d unhandled",
                                 proc->state, pr);
@@ -922,11 +914,11 @@ man1tr6(struct PStack *st, int pr, void *arg)
                 printk(KERN_ERR "HiSax man1tr6 without proc pr=%04x\n", pr);
                 return;
         }
-        for (i = 0; i < MANSLLEN; i++)
+        for (i = 0; i < ARRAY_SIZE(manstatelist); i++)
                 if ((pr == manstatelist[i].primitive) &&
                     ((1 << proc->state) & manstatelist[i].state))
                         break;
-        if (i == MANSLLEN) {
+        if (i == ARRAY_SIZE(manstatelist)) {
                 if (st->l3.debug & L3_DEB_STATE) {
                         l3_debug(st, "cr %d man1tr6 state %d prim %d unhandled",
                                 proc->callref & 0x7f, proc->state, pr);