powerpc/xmon: use ARRAY_SIZE on various array sizing calculations

Message ID 20171207110134.22566-1-colin.king@canonical.com
State Rejected
Headers show
Series
  • powerpc/xmon: use ARRAY_SIZE on various array sizing calculations
Related show

Commit Message

Colin Ian King Dec. 7, 2017, 11:01 a.m.
From: Colin Ian King <colin.king@canonical.com>

Use the ARRAY_SIZE macro on several arrays to determine their size.
Improvement suggested by coccinelle.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arch/powerpc/xmon/ppc-opc.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Comments

Balbir Singh Dec. 8, 2017, 3:37 a.m. | #1
On Thu, Dec 7, 2017 at 10:01 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Use the ARRAY_SIZE macro on several arrays to determine their size.
> Improvement suggested by coccinelle.
>

This file is taken from binutils and re-licensed. Keeping the file
as-is helps apply newer patches easily on top as opposed to redoing
the changes. I would prefer not to move to ARRAY_SIZE and stick to
what's already in the file.

Balbir Singh.
Michael Ellerman Dec. 8, 2017, 11:51 a.m. | #2
Balbir Singh <bsingharora@gmail.com> writes:

> On Thu, Dec 7, 2017 at 10:01 PM, Colin King <colin.king@canonical.com> wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> Use the ARRAY_SIZE macro on several arrays to determine their size.
>> Improvement suggested by coccinelle.
>
> This file is taken from binutils and re-licensed. Keeping the file
> as-is helps apply newer patches easily on top as opposed to redoing
> the changes. I would prefer not to move to ARRAY_SIZE and stick to
> what's already in the file.

Yep.

Thanks but no thanks on this one Colin.

Is there a checkpatch blacklist anywhere? So we don't keep discovering
things in this file that need to be fixed?

cheers
Joe Perches Dec. 8, 2017, 12:23 p.m. | #3
On Fri, 2017-12-08 at 22:51 +1100, Michael Ellerman wrote:
> Balbir Singh <bsingharora@gmail.com> writes:
> 
> > On Thu, Dec 7, 2017 at 10:01 PM, Colin King <colin.king@canonical.com> wrote:
> > > From: Colin Ian King <colin.king@canonical.com>
> > > 
> > > Use the ARRAY_SIZE macro on several arrays to determine their size.
> > > Improvement suggested by coccinelle.
> > 
> > This file is taken from binutils and re-licensed. Keeping the file
> > as-is helps apply newer patches easily on top as opposed to redoing
> > the changes. I would prefer not to move to ARRAY_SIZE and stick to
> > what's already in the file.
> 
> Yep.
> 
> Thanks but no thanks on this one Colin.
> 
> Is there a checkpatch blacklist anywhere? So we don't keep discovering
> things in this file that need to be fixed?

Nope.  Besides, this came via a coccinelle suggestion.

What might be useful is a generic marker somewhere in
a file that shows the file as a generated file and
indicates the file should not otherwise be modified.

Patch

diff --git a/arch/powerpc/xmon/ppc-opc.c b/arch/powerpc/xmon/ppc-opc.c
index ac2b55b1332e..f3f57a12d43b 100644
--- a/arch/powerpc/xmon/ppc-opc.c
+++ b/arch/powerpc/xmon/ppc-opc.c
@@ -966,8 +966,7 @@  const struct powerpc_operand powerpc_operands[] =
   { 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 @@  const struct powerpc_opcode powerpc_opcodes[] = {
 {"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 @@  const struct powerpc_opcode vle_opcodes[] = {
 {"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 @@  const struct powerpc_macro powerpc_macros[] = {
 {"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);