diff for duplicates of <200706111120.07730.lists-receive@programmierforen.de> diff --git a/a/1.txt b/N1/1.txt index b6ac8c7..0dcd709 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,7 @@ > > > --- a/drivers/isdn/hisax/callc.c > > > +++ b/drivers/isdn/hisax/callc.c -> > > @@ -834,7 +834,7 @@ static struct FsmNode fnlist[] __initdata > > > }; +> > > @@ -834,7 +834,7 @@ static struct FsmNode fnlist[] __initdata = +> > > }; > > > /* *INDENT-ON* */ > > > > > > -#define FNCOUNT (sizeof(fnlist)/sizeof(struct FsmNode)) @@ -32,7 +33,8 @@ diff --git a/drivers/isdn/hisax/callc.c b/drivers/isdn/hisax/callc.c index 7c56c44..0b9ed8e 100644 --- a/drivers/isdn/hisax/callc.c +++ b/drivers/isdn/hisax/callc.c -@@ -834,8 +834,6 @@ static struct FsmNode fnlist[] __initdata }; +@@ -834,8 +834,6 @@ static struct FsmNode fnlist[] __initdata = + }; /* *INDENT-ON* */ -#define FNCOUNT (sizeof(fnlist)/sizeof(struct FsmNode)) @@ -53,7 +55,8 @@ diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c index a14204e..39c749c 100644 --- a/drivers/isdn/hisax/isdnl1.c +++ b/drivers/isdn/hisax/isdnl1.c -@@ -647,7 +647,7 @@ static struct FsmNode L1SFnList[] __initdata {ST_L1_F8, EV_TIMER_DEACT, l1_timer_deact}, +@@ -647,7 +647,7 @@ static struct FsmNode L1SFnList[] __initdata = + {ST_L1_F8, EV_TIMER_DEACT, l1_timer_deact}, }; -#define L1S_FN_COUNT (sizeof(L1SFnList)/sizeof(struct FsmNode)) @@ -61,7 +64,8 @@ index a14204e..39c749c 100644 #ifdef HISAX_UINTERFACE static void -@@ -706,7 +706,7 @@ static struct FsmNode L1UFnList[] __initdata {ST_L1_RESET, EV_TIMER_DEACT, l1_timer_deact}, +@@ -706,7 +706,7 @@ static struct FsmNode L1UFnList[] __initdata = + {ST_L1_RESET, EV_TIMER_DEACT, l1_timer_deact}, }; -#define L1U_FN_COUNT (sizeof(L1UFnList)/sizeof(struct FsmNode)) @@ -69,7 +73,8 @@ index a14204e..39c749c 100644 #endif -@@ -754,7 +754,7 @@ static struct FsmNode L1BFnList[] __initdata {ST_L1_WAIT_DEACT, EV_TIMER_DEACT, l1b_timer_deact}, +@@ -754,7 +754,7 @@ static struct FsmNode L1BFnList[] __initdata = + {ST_L1_WAIT_DEACT, EV_TIMER_DEACT, l1b_timer_deact}, }; -#define L1B_FN_COUNT (sizeof(L1BFnList)/sizeof(struct FsmNode)) @@ -81,7 +86,8 @@ diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c index 3446f24..846a7e6 100644 --- a/drivers/isdn/hisax/isdnl2.c +++ b/drivers/isdn/hisax/isdnl2.c -@@ -1623,7 +1623,7 @@ static struct FsmNode L2FnList[] __initdata {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da}, +@@ -1623,7 +1623,7 @@ static struct FsmNode L2FnList[] __initdata = + {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da}, }; -#define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode)) @@ -93,7 +99,8 @@ diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c index 935f233..c081fed 100644 --- a/drivers/isdn/hisax/isdnl3.c +++ b/drivers/isdn/hisax/isdnl3.c -@@ -543,7 +543,7 @@ static struct FsmNode L3FnList[] __initdata }; +@@ -543,7 +543,7 @@ static struct FsmNode L3FnList[] __initdata = + }; /* *INDENT-ON* */ -#define L3_FN_COUNT (sizeof(L3FnList)/sizeof(struct FsmNode)) @@ -105,23 +112,28 @@ diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c index c5c36ee..ff62679 100644 --- a/drivers/isdn/hisax/l3_1tr6.c +++ b/drivers/isdn/hisax/l3_1tr6.c -@@ -698,8 +698,7 @@ static struct stateentry downstl[] CC_T308_2, l3_1tr6_t308_2}, +@@ -698,8 +698,7 @@ static struct stateentry downstl[] = + CC_T308_2, l3_1tr6_t308_2}, }; -#define DOWNSTL_LEN \ - (sizeof(downstl) / sizeof(struct stateentry)) +#define DOWNSTL_LEN ARRAY_SIZE(downstl) - static struct stateentry datastln1[] { -@@ -735,8 +734,7 @@ static struct stateentry datastln1[] MT_N1_REL_ACK, l3_1tr6_rel_ack} + static struct stateentry datastln1[] = + { +@@ -735,8 +734,7 @@ static struct stateentry datastln1[] = + MT_N1_REL_ACK, l3_1tr6_rel_ack} }; -#define DATASTLN1_LEN \ - (sizeof(datastln1) / sizeof(struct stateentry)) +#define DATASTLN1_LEN ARRAY_SIZE(datastln1) - static struct stateentry manstatelist[] { -@@ -746,8 +744,7 @@ static struct stateentry manstatelist[] DL_RELEASE | INDICATION, l3_1tr6_dl_release}, + static struct stateentry manstatelist[] = + { +@@ -746,8 +744,7 @@ static struct stateentry manstatelist[] = + DL_RELEASE | INDICATION, l3_1tr6_dl_release}, }; -#define MANSLLEN \ @@ -134,31 +146,38 @@ diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c index 99feae8..c434fa5 100644 --- a/drivers/isdn/hisax/l3dss1.c +++ b/drivers/isdn/hisax/l3dss1.c -@@ -2820,8 +2820,7 @@ static struct stateentry downstatelist[] CC_T309, l3dss1_dl_release}, +@@ -2820,8 +2820,7 @@ static struct stateentry downstatelist[] = + CC_T309, l3dss1_dl_release}, }; -#define DOWNSLLEN \ - (sizeof(downstatelist) / sizeof(struct stateentry)) +#define DOWNSLLEN ARRAY_SIZE(downstatelist) - static struct stateentry datastatelist[] { -@@ -2875,8 +2874,7 @@ static struct stateentry datastatelist[] MT_RESUME_REJECT, l3dss1_resume_rej}, + static struct stateentry datastatelist[] = + { +@@ -2875,8 +2874,7 @@ static struct stateentry datastatelist[] = + MT_RESUME_REJECT, l3dss1_resume_rej}, }; -#define DATASLLEN \ - (sizeof(datastatelist) / sizeof(struct stateentry)) +#define DATASLLEN ARRAY_SIZE(datastatelist) - static struct stateentry globalmes_list[] { -@@ -2888,8 +2886,7 @@ static struct stateentry globalmes_list[] MT_RESTART_ACKNOWLEDGE, l3dss1_restart_ack}, + static struct stateentry globalmes_list[] = + { +@@ -2888,8 +2886,7 @@ static struct stateentry globalmes_list[] = + MT_RESTART_ACKNOWLEDGE, l3dss1_restart_ack}, */ }; -#define GLOBALM_LEN \ - (sizeof(globalmes_list) / sizeof(struct stateentry)) +#define GLOBALM_LEN ARRAY_SIZE(globalmes_list) - static struct stateentry manstatelist[] { -@@ -2903,8 +2900,7 @@ static struct stateentry manstatelist[] DL_RELEASE | INDICATION, l3dss1_dl_release}, + static struct stateentry manstatelist[] = + { +@@ -2903,8 +2900,7 @@ static struct stateentry manstatelist[] = + DL_RELEASE | INDICATION, l3dss1_dl_release}, }; -#define MANSLLEN \ @@ -171,31 +190,38 @@ diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c index f7041d5..ba05ae3 100644 --- a/drivers/isdn/hisax/l3ni1.c +++ b/drivers/isdn/hisax/l3ni1.c -@@ -2755,8 +2755,7 @@ static struct stateentry downstatelist[] CC_TSPID, l3ni1_spid_tout }, +@@ -2755,8 +2755,7 @@ static struct stateentry downstatelist[] = + CC_TSPID, l3ni1_spid_tout }, }; -#define DOWNSLLEN \ - (sizeof(downstatelist) / sizeof(struct stateentry)) +#define DOWNSLLEN ARRAY_SIZE(downstatelist) - static struct stateentry datastatelist[] { -@@ -2810,8 +2809,7 @@ static struct stateentry datastatelist[] MT_RESUME_REJECT, l3ni1_resume_rej}, + static struct stateentry datastatelist[] = + { +@@ -2810,8 +2809,7 @@ static struct stateentry datastatelist[] = + MT_RESUME_REJECT, l3ni1_resume_rej}, }; -#define DATASLLEN \ - (sizeof(datastatelist) / sizeof(struct stateentry)) +#define DATASLLEN ARRAY_SIZE(datastatelist) - static struct stateentry globalmes_list[] { -@@ -2825,8 +2823,7 @@ static struct stateentry globalmes_list[] { SBIT( 0 ), MT_DL_ESTABLISHED, l3ni1_spid_send }, + static struct stateentry globalmes_list[] = + { +@@ -2825,8 +2823,7 @@ static struct stateentry globalmes_list[] = + { SBIT( 0 ), MT_DL_ESTABLISHED, l3ni1_spid_send }, { SBIT( 20 ) | SBIT( 21 ) | SBIT( 22 ), MT_INFORMATION, l3ni1_spid_epid }, }; -#define GLOBALM_LEN \ - (sizeof(globalmes_list) / sizeof(struct stateentry)) +#define GLOBALM_LEN ARRAY_SIZE(globalmes_list) - static struct stateentry manstatelist[] { -@@ -2840,8 +2837,7 @@ static struct stateentry manstatelist[] DL_RELEASE | INDICATION, l3ni1_dl_release}, + static struct stateentry manstatelist[] = + { +@@ -2840,8 +2837,7 @@ static struct stateentry manstatelist[] = + DL_RELEASE | INDICATION, l3ni1_dl_release}, }; -#define MANSLLEN \ @@ -216,14 +242,18 @@ index aacbf0d..8b853d5 100644 +#define MTSIZE ARRAY_SIZE(mtlist) static - struct MessageType mt_n0[] @@ -157,7 +157,7 @@ struct MessageType mt_n0[] {MT_N0_CLO_ACK, "CLOse ACKnowledge"} + struct MessageType mt_n0[] = +@@ -157,7 +157,7 @@ struct MessageType mt_n0[] = + {MT_N0_CLO_ACK, "CLOse ACKnowledge"} }; -#define MT_N0_LEN (sizeof(mt_n0) / sizeof(struct MessageType)) +#define MT_N0_LEN ARRAY_SIZE(mt_n0) static - struct MessageType mt_n1[] @@ -194,7 +194,7 @@ struct MessageType mt_n1[] {MT_N1_STAT, "STATus"} + struct MessageType mt_n1[] = +@@ -194,7 +194,7 @@ struct MessageType mt_n1[] = + {MT_N1_STAT, "STATus"} }; -#define MT_N1_LEN (sizeof(mt_n1) / sizeof(struct MessageType)) @@ -240,7 +270,8 @@ index aacbf0d..8b853d5 100644 static int -@@ -516,7 +516,7 @@ struct MessageType cause_1tr6[] {CAUSE_UserInfoDiscarded, "User Info Discarded"} +@@ -516,7 +516,7 @@ struct MessageType cause_1tr6[] = + {CAUSE_UserInfoDiscarded, "User Info Discarded"} }; -static int cause_1tr6_len = (sizeof(cause_1tr6) / sizeof(struct MessageType)); @@ -290,15 +321,19 @@ index aacbf0d..8b853d5 100644 -#define IESIZE_NI1_CS6 sizeof(ielist_ni1_cs6)/sizeof(struct InformationElement) +#define IESIZE_NI1_CS6 ARRAY_SIZE(ielist_ni1_cs6) - static struct InformationElement we_0[] { -@@ -1133,7 +1133,7 @@ static struct InformationElement we_0[] {WE0_userInfo, "User Info", general} + static struct InformationElement we_0[] = + { +@@ -1133,7 +1133,7 @@ static struct InformationElement we_0[] = + {WE0_userInfo, "User Info", general} }; -#define WE_0_LEN (sizeof(we_0) / sizeof(struct InformationElement)) +#define WE_0_LEN ARRAY_SIZE(we_0) - static struct InformationElement we_6[] { -@@ -1145,7 +1145,7 @@ static struct InformationElement we_6[] {WE6_statusCalled, "Status Called", general}, + static struct InformationElement we_6[] = + { +@@ -1145,7 +1145,7 @@ static struct InformationElement we_6[] = + {WE6_statusCalled, "Status Called", general}, {WE6_addTransAttr, "Additional Transmission Attributes", general} }; -#define WE_6_LEN (sizeof(we_6) / sizeof(struct InformationElement)) @@ -310,7 +345,8 @@ diff --git a/drivers/isdn/hisax/tei.c b/drivers/isdn/hisax/tei.c index ceb0df9..21567af 100644 --- a/drivers/isdn/hisax/tei.c +++ b/drivers/isdn/hisax/tei.c -@@ -447,7 +447,7 @@ static struct FsmNode TeiFnList[] __initdata {ST_TEI_IDVERIFY, EV_CHKREQ, tei_id_chk_req}, +@@ -447,7 +447,7 @@ static struct FsmNode TeiFnList[] __initdata = + {ST_TEI_IDVERIFY, EV_CHKREQ, tei_id_chk_req}, }; -#define TEI_FN_COUNT (sizeof(TeiFnList)/sizeof(struct FsmNode)) @@ -318,7 +354,3 @@ index ceb0df9..21567af 100644 int __init TeiNew(void) -_______________________________________________ -Kernel-janitors mailing list -Kernel-janitors@lists.linux-foundation.org -https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors diff --git a/a/content_digest b/N1/content_digest index f92c03b..011f49f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,8 @@ "ref\020070610131122.GB3588@pingi.kke.suse.de\0" "ref\020070610131402.GR2649@lug-owl.de\0" "From\0Andi Drebes <lists-receive@programmierforen.de>\0" - "Subject\0[KJ] Re: [PATCH] drivers/isdn/hisax: ARRAY_SIZE instead of sizeof\0" - "Date\0Mon, 11 Jun 2007 09:20:07 +0000\0" + "Subject\0Re: [PATCH] drivers/isdn/hisax: ARRAY_SIZE instead of sizeof\0" + "Date\0Mon, 11 Jun 2007 11:20:07 +0200\0" "To\0Jan-Benedict Glaw <jbglaw@lug-owl.de>\0" "Cc\0kernel-janitors@lists.osdl.org" linux-kernel <linux-kernel@vger.kernel.org> @@ -12,7 +12,8 @@ "b\0" "> > > --- a/drivers/isdn/hisax/callc.c\n" "> > > +++ b/drivers/isdn/hisax/callc.c\n" - "> > > @@ -834,7 +834,7 @@ static struct FsmNode fnlist[] __initdata > > > };\n" + "> > > @@ -834,7 +834,7 @@ static struct FsmNode fnlist[] __initdata =\n" + "> > > };\n" "> > > /* *INDENT-ON* */\n" "> > > \n" "> > > -#define FNCOUNT (sizeof(fnlist)/sizeof(struct FsmNode))\n" @@ -44,7 +45,8 @@ "index 7c56c44..0b9ed8e 100644\n" "--- a/drivers/isdn/hisax/callc.c\n" "+++ b/drivers/isdn/hisax/callc.c\n" - "@@ -834,8 +834,6 @@ static struct FsmNode fnlist[] __initdata };\n" + "@@ -834,8 +834,6 @@ static struct FsmNode fnlist[] __initdata =\n" + " };\n" " /* *INDENT-ON* */\n" " \n" "-#define FNCOUNT (sizeof(fnlist)/sizeof(struct FsmNode))\n" @@ -65,7 +67,8 @@ "index a14204e..39c749c 100644\n" "--- a/drivers/isdn/hisax/isdnl1.c\n" "+++ b/drivers/isdn/hisax/isdnl1.c\n" - "@@ -647,7 +647,7 @@ static struct FsmNode L1SFnList[] __initdata \t{ST_L1_F8, EV_TIMER_DEACT, l1_timer_deact},\n" + "@@ -647,7 +647,7 @@ static struct FsmNode L1SFnList[] __initdata =\n" + " \t{ST_L1_F8, EV_TIMER_DEACT, l1_timer_deact},\n" " };\n" " \n" "-#define L1S_FN_COUNT (sizeof(L1SFnList)/sizeof(struct FsmNode))\n" @@ -73,7 +76,8 @@ " \n" " #ifdef HISAX_UINTERFACE\n" " static void\n" - "@@ -706,7 +706,7 @@ static struct FsmNode L1UFnList[] __initdata \t{ST_L1_RESET, EV_TIMER_DEACT, l1_timer_deact},\n" + "@@ -706,7 +706,7 @@ static struct FsmNode L1UFnList[] __initdata =\n" + " \t{ST_L1_RESET, EV_TIMER_DEACT, l1_timer_deact},\n" " };\n" " \n" "-#define L1U_FN_COUNT (sizeof(L1UFnList)/sizeof(struct FsmNode))\n" @@ -81,7 +85,8 @@ " \n" " #endif\n" " \n" - "@@ -754,7 +754,7 @@ static struct FsmNode L1BFnList[] __initdata \t{ST_L1_WAIT_DEACT, EV_TIMER_DEACT, l1b_timer_deact},\n" + "@@ -754,7 +754,7 @@ static struct FsmNode L1BFnList[] __initdata =\n" + " \t{ST_L1_WAIT_DEACT, EV_TIMER_DEACT, l1b_timer_deact},\n" " };\n" " \n" "-#define L1B_FN_COUNT (sizeof(L1BFnList)/sizeof(struct FsmNode))\n" @@ -93,7 +98,8 @@ "index 3446f24..846a7e6 100644\n" "--- a/drivers/isdn/hisax/isdnl2.c\n" "+++ b/drivers/isdn/hisax/isdnl2.c\n" - "@@ -1623,7 +1623,7 @@ static struct FsmNode L2FnList[] __initdata \t{ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da},\n" + "@@ -1623,7 +1623,7 @@ static struct FsmNode L2FnList[] __initdata =\n" + " \t{ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da},\n" " };\n" " \n" "-#define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode))\n" @@ -105,7 +111,8 @@ "index 935f233..c081fed 100644\n" "--- a/drivers/isdn/hisax/isdnl3.c\n" "+++ b/drivers/isdn/hisax/isdnl3.c\n" - "@@ -543,7 +543,7 @@ static struct FsmNode L3FnList[] __initdata };\n" + "@@ -543,7 +543,7 @@ static struct FsmNode L3FnList[] __initdata =\n" + " };\n" " /* *INDENT-ON* */\n" " \n" "-#define L3_FN_COUNT (sizeof(L3FnList)/sizeof(struct FsmNode))\n" @@ -117,23 +124,28 @@ "index c5c36ee..ff62679 100644\n" "--- a/drivers/isdn/hisax/l3_1tr6.c\n" "+++ b/drivers/isdn/hisax/l3_1tr6.c\n" - "@@ -698,8 +698,7 @@ static struct stateentry downstl[] \t CC_T308_2, l3_1tr6_t308_2},\n" + "@@ -698,8 +698,7 @@ static struct stateentry downstl[] =\n" + " \t CC_T308_2, l3_1tr6_t308_2},\n" " };\n" " \n" "-#define DOWNSTL_LEN \\\n" "-\t(sizeof(downstl) / sizeof(struct stateentry))\n" "+#define DOWNSTL_LEN ARRAY_SIZE(downstl)\n" " \n" - " static struct stateentry datastln1[] {\n" - "@@ -735,8 +734,7 @@ static struct stateentry datastln1[] \t MT_N1_REL_ACK, l3_1tr6_rel_ack}\n" + " static struct stateentry datastln1[] =\n" + " {\n" + "@@ -735,8 +734,7 @@ static struct stateentry datastln1[] =\n" + " \t MT_N1_REL_ACK, l3_1tr6_rel_ack}\n" " };\n" " \n" "-#define DATASTLN1_LEN \\\n" "-\t(sizeof(datastln1) / sizeof(struct stateentry))\n" "+#define DATASTLN1_LEN ARRAY_SIZE(datastln1)\n" " \n" - " static struct stateentry manstatelist[] {\n" - "@@ -746,8 +744,7 @@ static struct stateentry manstatelist[] DL_RELEASE | INDICATION, l3_1tr6_dl_release},\n" + " static struct stateentry manstatelist[] =\n" + " {\n" + "@@ -746,8 +744,7 @@ static struct stateentry manstatelist[] =\n" + " DL_RELEASE | INDICATION, l3_1tr6_dl_release},\n" " };\n" " \n" "-#define MANSLLEN \\\n" @@ -146,31 +158,38 @@ "index 99feae8..c434fa5 100644\n" "--- a/drivers/isdn/hisax/l3dss1.c\n" "+++ b/drivers/isdn/hisax/l3dss1.c\n" - "@@ -2820,8 +2820,7 @@ static struct stateentry downstatelist[] \t CC_T309, l3dss1_dl_release},\n" + "@@ -2820,8 +2820,7 @@ static struct stateentry downstatelist[] =\n" + " \t CC_T309, l3dss1_dl_release},\n" " };\n" " \n" "-#define DOWNSLLEN \\\n" "-\t(sizeof(downstatelist) / sizeof(struct stateentry))\n" "+#define DOWNSLLEN ARRAY_SIZE(downstatelist)\n" " \n" - " static struct stateentry datastatelist[] {\n" - "@@ -2875,8 +2874,7 @@ static struct stateentry datastatelist[] \t MT_RESUME_REJECT, l3dss1_resume_rej},\n" + " static struct stateentry datastatelist[] =\n" + " {\n" + "@@ -2875,8 +2874,7 @@ static struct stateentry datastatelist[] =\n" + " \t MT_RESUME_REJECT, l3dss1_resume_rej},\n" " };\n" " \n" "-#define DATASLLEN \\\n" "-\t(sizeof(datastatelist) / sizeof(struct stateentry))\n" "+#define DATASLLEN ARRAY_SIZE(datastatelist)\n" " \n" - " static struct stateentry globalmes_list[] {\n" - "@@ -2888,8 +2886,7 @@ static struct stateentry globalmes_list[] \t MT_RESTART_ACKNOWLEDGE, l3dss1_restart_ack},\n" + " static struct stateentry globalmes_list[] =\n" + " {\n" + "@@ -2888,8 +2886,7 @@ static struct stateentry globalmes_list[] =\n" + " \t MT_RESTART_ACKNOWLEDGE, l3dss1_restart_ack},\n" " */\n" " };\n" "-#define GLOBALM_LEN \\\n" "-\t(sizeof(globalmes_list) / sizeof(struct stateentry))\n" "+#define GLOBALM_LEN ARRAY_SIZE(globalmes_list)\n" " \n" - " static struct stateentry manstatelist[] {\n" - "@@ -2903,8 +2900,7 @@ static struct stateentry manstatelist[] DL_RELEASE | INDICATION, l3dss1_dl_release},\n" + " static struct stateentry manstatelist[] =\n" + " {\n" + "@@ -2903,8 +2900,7 @@ static struct stateentry manstatelist[] =\n" + " DL_RELEASE | INDICATION, l3dss1_dl_release},\n" " };\n" " \n" "-#define MANSLLEN \\\n" @@ -183,31 +202,38 @@ "index f7041d5..ba05ae3 100644\n" "--- a/drivers/isdn/hisax/l3ni1.c\n" "+++ b/drivers/isdn/hisax/l3ni1.c\n" - "@@ -2755,8 +2755,7 @@ static struct stateentry downstatelist[] \t CC_TSPID, l3ni1_spid_tout },\n" + "@@ -2755,8 +2755,7 @@ static struct stateentry downstatelist[] =\n" + " \t CC_TSPID, l3ni1_spid_tout },\n" " };\n" " \n" "-#define DOWNSLLEN \\\n" "-\t(sizeof(downstatelist) / sizeof(struct stateentry))\n" "+#define DOWNSLLEN ARRAY_SIZE(downstatelist)\n" " \n" - " static struct stateentry datastatelist[] {\n" - "@@ -2810,8 +2809,7 @@ static struct stateentry datastatelist[] \t MT_RESUME_REJECT, l3ni1_resume_rej},\n" + " static struct stateentry datastatelist[] =\n" + " {\n" + "@@ -2810,8 +2809,7 @@ static struct stateentry datastatelist[] =\n" + " \t MT_RESUME_REJECT, l3ni1_resume_rej},\n" " };\n" " \n" "-#define DATASLLEN \\\n" "-\t(sizeof(datastatelist) / sizeof(struct stateentry))\n" "+#define DATASLLEN ARRAY_SIZE(datastatelist)\n" " \n" - " static struct stateentry globalmes_list[] {\n" - "@@ -2825,8 +2823,7 @@ static struct stateentry globalmes_list[] \t{ SBIT( 0 ), MT_DL_ESTABLISHED, l3ni1_spid_send },\n" + " static struct stateentry globalmes_list[] =\n" + " {\n" + "@@ -2825,8 +2823,7 @@ static struct stateentry globalmes_list[] =\n" + " \t{ SBIT( 0 ), MT_DL_ESTABLISHED, l3ni1_spid_send },\n" " \t{ SBIT( 20 ) | SBIT( 21 ) | SBIT( 22 ), MT_INFORMATION, l3ni1_spid_epid },\n" " };\n" "-#define GLOBALM_LEN \\\n" "-\t(sizeof(globalmes_list) / sizeof(struct stateentry))\n" "+#define GLOBALM_LEN ARRAY_SIZE(globalmes_list)\n" " \n" - " static struct stateentry manstatelist[] {\n" - "@@ -2840,8 +2837,7 @@ static struct stateentry manstatelist[] DL_RELEASE | INDICATION, l3ni1_dl_release},\n" + " static struct stateentry manstatelist[] =\n" + " {\n" + "@@ -2840,8 +2837,7 @@ static struct stateentry manstatelist[] =\n" + " DL_RELEASE | INDICATION, l3ni1_dl_release},\n" " };\n" " \n" "-#define MANSLLEN \\\n" @@ -228,14 +254,18 @@ "+#define MTSIZE ARRAY_SIZE(mtlist)\n" " \n" " static\n" - " struct MessageType mt_n0[] @@ -157,7 +157,7 @@ struct MessageType mt_n0[] \t{MT_N0_CLO_ACK, \"CLOse ACKnowledge\"}\n" + " struct MessageType mt_n0[] =\n" + "@@ -157,7 +157,7 @@ struct MessageType mt_n0[] =\n" + " \t{MT_N0_CLO_ACK, \"CLOse ACKnowledge\"}\n" " };\n" " \n" "-#define MT_N0_LEN (sizeof(mt_n0) / sizeof(struct MessageType))\n" "+#define MT_N0_LEN ARRAY_SIZE(mt_n0)\n" " \n" " static\n" - " struct MessageType mt_n1[] @@ -194,7 +194,7 @@ struct MessageType mt_n1[] \t{MT_N1_STAT, \"STATus\"}\n" + " struct MessageType mt_n1[] =\n" + "@@ -194,7 +194,7 @@ struct MessageType mt_n1[] =\n" + " \t{MT_N1_STAT, \"STATus\"}\n" " };\n" " \n" "-#define MT_N1_LEN (sizeof(mt_n1) / sizeof(struct MessageType))\n" @@ -252,7 +282,8 @@ " \n" " static\n" " int\n" - "@@ -516,7 +516,7 @@ struct MessageType cause_1tr6[] \t{CAUSE_UserInfoDiscarded, \"User Info Discarded\"}\n" + "@@ -516,7 +516,7 @@ struct MessageType cause_1tr6[] =\n" + " \t{CAUSE_UserInfoDiscarded, \"User Info Discarded\"}\n" " };\n" " \n" "-static int cause_1tr6_len = (sizeof(cause_1tr6) / sizeof(struct MessageType));\n" @@ -302,15 +333,19 @@ "-#define IESIZE_NI1_CS6 sizeof(ielist_ni1_cs6)/sizeof(struct InformationElement)\n" "+#define IESIZE_NI1_CS6 ARRAY_SIZE(ielist_ni1_cs6)\n" " \n" - " static struct InformationElement we_0[] {\n" - "@@ -1133,7 +1133,7 @@ static struct InformationElement we_0[] \t{WE0_userInfo, \"User Info\", general}\n" + " static struct InformationElement we_0[] =\n" + " {\n" + "@@ -1133,7 +1133,7 @@ static struct InformationElement we_0[] =\n" + " \t{WE0_userInfo, \"User Info\", general}\n" " };\n" " \n" "-#define WE_0_LEN (sizeof(we_0) / sizeof(struct InformationElement))\n" "+#define WE_0_LEN ARRAY_SIZE(we_0)\n" " \n" - " static struct InformationElement we_6[] {\n" - "@@ -1145,7 +1145,7 @@ static struct InformationElement we_6[] \t{WE6_statusCalled, \"Status Called\", general},\n" + " static struct InformationElement we_6[] =\n" + " {\n" + "@@ -1145,7 +1145,7 @@ static struct InformationElement we_6[] =\n" + " \t{WE6_statusCalled, \"Status Called\", general},\n" " \t{WE6_addTransAttr, \"Additional Transmission Attributes\", general}\n" " };\n" "-#define WE_6_LEN (sizeof(we_6) / sizeof(struct InformationElement))\n" @@ -322,17 +357,14 @@ "index ceb0df9..21567af 100644\n" "--- a/drivers/isdn/hisax/tei.c\n" "+++ b/drivers/isdn/hisax/tei.c\n" - "@@ -447,7 +447,7 @@ static struct FsmNode TeiFnList[] __initdata \t{ST_TEI_IDVERIFY, EV_CHKREQ, tei_id_chk_req},\n" + "@@ -447,7 +447,7 @@ static struct FsmNode TeiFnList[] __initdata =\n" + " \t{ST_TEI_IDVERIFY, EV_CHKREQ, tei_id_chk_req},\n" " };\n" " \n" "-#define TEI_FN_COUNT (sizeof(TeiFnList)/sizeof(struct FsmNode))\n" "+#define TEI_FN_COUNT ARRAY_SIZE(TeiFnList)\n" " \n" " int __init\n" - " TeiNew(void)\n" - "_______________________________________________\n" - "Kernel-janitors mailing list\n" - "Kernel-janitors@lists.linux-foundation.org\n" - https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors + TeiNew(void) -7739faf33977ed333a84c270248e97abbc2f14115a40a48985e3838e9bb760e6 +082f1a3e91a0eff5b6a3d7c17d5a063b871844efd3a39fc7bd3cdc589652d32d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.