| Message ID | 1534214814-9043-3-git-send-email-zhongjiang@huawei.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
| Series | Use ARRAY_SIZE to replace its implementation | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/checkpatch | success | Test checkpatch on branch next |
| snowpatch_ozlabs/build-ppc64le | success | Test build-ppc64le on branch next |
| snowpatch_ozlabs/build-ppc64be | success | Test build-ppc64be on branch next |
| snowpatch_ozlabs/build-ppc64e | success | Test build-ppc64e on branch next |
| snowpatch_ozlabs/build-ppc32 | success | Test build-ppc32 on branch next |
On Tue, 2018-08-14 at 10:46 +0800, zhong jiang wrote: > Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element. > So just replace it. Better to remove the extern and the const altogether here as well. $ git grep -w powerpc_num_opcodes arch/powerpc/xmon/ppc-dis.c: opcode_end = powerpc_opcodes + powerpc_num_opcodes; arch/powerpc/xmon/ppc-opc.c:const int powerpc_num_opcodes = arch/powerpc/xmon/ppc.h:extern const int powerpc_num_opcodes; And this one could be removed instead: $ git grep -w vle_num_opcodes arch/powerpc/xmon/ppc-opc.c:const int vle_num_opcodes = arch/powerpc/xmon/ppc.h:extern const int vle_num_opcodes; > Signed-off-by: zhong jiang <zhongjiang@huawei.com> > --- > arch/powerpc/xmon/ppc-opc.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/xmon/ppc-opc.c b/arch/powerpc/xmon/ppc-opc.c > index ac2b55b..f3f57a1 100644 > --- a/arch/powerpc/xmon/ppc-opc.c > +++ b/arch/powerpc/xmon/ppc-opc.c > @@ -966,8 +966,7 @@ > { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT }, > }; > > -const unsigned int num_powerpc_operands = (sizeof (powerpc_operands) > - / sizeof (powerpc_operands[0])); > +const unsigned int num_powerpc_operands = ARRAY_SIZE(powerpc_operands); > > /* The functions used to insert and extract complicated operands. */ > > @@ -6980,8 +6979,7 @@ > {"fcfidu.", XRC(63,974,1), XRA_MASK, POWER7|PPCA2, PPCVLE, {FRT, FRB}}, > }; > > -const int powerpc_num_opcodes = > - sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]); > +const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes); > > /* The VLE opcode table. > > @@ -7219,8 +7217,7 @@ > {"se_bl", BD8(58,0,1), BD8_MASK, PPCVLE, 0, {B8}}, > }; > > -const int vle_num_opcodes = > - sizeof (vle_opcodes) / sizeof (vle_opcodes[0]); > +const int vle_num_opcodes = ARRAY_SIZE(vle_opcodes); > > /* The macro table. This is only used by the assembler. */ > > @@ -7288,5 +7285,4 @@ > {"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"}, > }; > > -const int powerpc_num_macros = > - sizeof (powerpc_macros) / sizeof (powerpc_macros[0]); > +const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros);
zhong jiang <zhongjiang@huawei.com> writes: > Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element. > So just replace it. > > Signed-off-by: zhong jiang <zhongjiang@huawei.com> > --- > arch/powerpc/xmon/ppc-opc.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) This code is copied from binutils and we don't want to needlessly cause it to diverge from the binutils copy. So thanks but no thanks. cheers > diff --git a/arch/powerpc/xmon/ppc-opc.c b/arch/powerpc/xmon/ppc-opc.c > index ac2b55b..f3f57a1 100644 > --- a/arch/powerpc/xmon/ppc-opc.c > +++ b/arch/powerpc/xmon/ppc-opc.c > @@ -966,8 +966,7 @@ > { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT }, > }; > > -const unsigned int num_powerpc_operands = (sizeof (powerpc_operands) > - / sizeof (powerpc_operands[0])); > +const unsigned int num_powerpc_operands = ARRAY_SIZE(powerpc_operands); > > /* The functions used to insert and extract complicated operands. */ > > @@ -6980,8 +6979,7 @@ > {"fcfidu.", XRC(63,974,1), XRA_MASK, POWER7|PPCA2, PPCVLE, {FRT, FRB}}, > }; > > -const int powerpc_num_opcodes = > - sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]); > +const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes); > > /* The VLE opcode table. > > @@ -7219,8 +7217,7 @@ > {"se_bl", BD8(58,0,1), BD8_MASK, PPCVLE, 0, {B8}}, > }; > > -const int vle_num_opcodes = > - sizeof (vle_opcodes) / sizeof (vle_opcodes[0]); > +const int vle_num_opcodes = ARRAY_SIZE(vle_opcodes); > > /* The macro table. This is only used by the assembler. */ > > @@ -7288,5 +7285,4 @@ > {"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"}, > }; > > -const int powerpc_num_macros = > - sizeof (powerpc_macros) / sizeof (powerpc_macros[0]); > +const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros); > -- > 1.7.12.4
On 2018/8/14 17:28, Michael Ellerman wrote: > zhong jiang <zhongjiang@huawei.com> writes: >> Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element. >> So just replace it. >> >> Signed-off-by: zhong jiang <zhongjiang@huawei.com> >> --- >> arch/powerpc/xmon/ppc-opc.c | 12 ++++-------- >> 1 file changed, 4 insertions(+), 8 deletions(-) > This code is copied from binutils and we don't want to needlessly cause > it to diverge from the binutils copy. > > So thanks but no thanks. Thank you for clarification. Sincerely zhong jiang > cheers > >> diff --git a/arch/powerpc/xmon/ppc-opc.c b/arch/powerpc/xmon/ppc-opc.c >> index ac2b55b..f3f57a1 100644 >> --- a/arch/powerpc/xmon/ppc-opc.c >> +++ b/arch/powerpc/xmon/ppc-opc.c >> @@ -966,8 +966,7 @@ >> { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT }, >> }; >> >> -const unsigned int num_powerpc_operands = (sizeof (powerpc_operands) >> - / sizeof (powerpc_operands[0])); >> +const unsigned int num_powerpc_operands = ARRAY_SIZE(powerpc_operands); >> >> /* The functions used to insert and extract complicated operands. */ >> >> @@ -6980,8 +6979,7 @@ >> {"fcfidu.", XRC(63,974,1), XRA_MASK, POWER7|PPCA2, PPCVLE, {FRT, FRB}}, >> }; >> >> -const int powerpc_num_opcodes = >> - sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]); >> +const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes); >> >> /* The VLE opcode table. >> >> @@ -7219,8 +7217,7 @@ >> {"se_bl", BD8(58,0,1), BD8_MASK, PPCVLE, 0, {B8}}, >> }; >> >> -const int vle_num_opcodes = >> - sizeof (vle_opcodes) / sizeof (vle_opcodes[0]); >> +const int vle_num_opcodes = ARRAY_SIZE(vle_opcodes); >> >> /* The macro table. This is only used by the assembler. */ >> >> @@ -7288,5 +7285,4 @@ >> {"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"}, >> }; >> >> -const int powerpc_num_macros = >> - sizeof (powerpc_macros) / sizeof (powerpc_macros[0]); >> +const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros); >> -- >> 1.7.12.4 > . >
diff --git a/arch/powerpc/xmon/ppc-opc.c b/arch/powerpc/xmon/ppc-opc.c index ac2b55b..f3f57a1 100644 --- a/arch/powerpc/xmon/ppc-opc.c +++ b/arch/powerpc/xmon/ppc-opc.c @@ -966,8 +966,7 @@ { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT }, }; -const unsigned int num_powerpc_operands = (sizeof (powerpc_operands) - / sizeof (powerpc_operands[0])); +const unsigned int num_powerpc_operands = ARRAY_SIZE(powerpc_operands); /* The functions used to insert and extract complicated operands. */ @@ -6980,8 +6979,7 @@ {"fcfidu.", XRC(63,974,1), XRA_MASK, POWER7|PPCA2, PPCVLE, {FRT, FRB}}, }; -const int powerpc_num_opcodes = - sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]); +const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes); /* The VLE opcode table. @@ -7219,8 +7217,7 @@ {"se_bl", BD8(58,0,1), BD8_MASK, PPCVLE, 0, {B8}}, }; -const int vle_num_opcodes = - sizeof (vle_opcodes) / sizeof (vle_opcodes[0]); +const int vle_num_opcodes = ARRAY_SIZE(vle_opcodes); /* The macro table. This is only used by the assembler. */ @@ -7288,5 +7285,4 @@ {"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"}, }; -const int powerpc_num_macros = - sizeof (powerpc_macros) / sizeof (powerpc_macros[0]); +const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros);
Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element. So just replace it. Signed-off-by: zhong jiang <zhongjiang@huawei.com> --- arch/powerpc/xmon/ppc-opc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)