Skip to content

Commit

Permalink
[POWERPC] Use ARRAY_SIZE macro when appropriate
Browse files Browse the repository at this point in the history
Use ARRAY_SIZE macro already defined in linux/kernel.h

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Ahmed S. Darwish authored and Paul Mackerras committed Feb 8, 2007
1 parent 0524aad commit 3839a59
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion arch/powerpc/lib/rheap.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/slab.h>

Expand Down Expand Up @@ -671,7 +672,7 @@ void rh_dump(rh_info_t * info)
int maxnr;
int i, nr;

maxnr = sizeof(st) / sizeof(st[0]);
maxnr = ARRAY_SIZE(st);

printk(KERN_INFO
"info @0x%p (%d slots empty / %d max)\n",
Expand Down
7 changes: 3 additions & 4 deletions arch/powerpc/xmon/ppc-opc.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
02110-1301, USA. */

#include <linux/stddef.h>
#include <linux/kernel.h>
#include "nonstdio.h"
#include "ppc.h"

Expand Down Expand Up @@ -4932,8 +4933,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {

};

const int powerpc_num_opcodes =
sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]);
const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);

/* The macro table. This is only used by the assembler. */

Expand Down Expand Up @@ -4989,5 +4989,4 @@ const struct powerpc_macro powerpc_macros[] = {
{ "clrlslwi.",4, PPCCOM, "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);
4 changes: 2 additions & 2 deletions arch/powerpc/xmon/spu-opc.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */

#include <linux/kernel.h>
#include "spu.h"

/* This file holds the Spu opcode table */
Expand All @@ -40,5 +41,4 @@ const struct spu_opcode spu_opcodes[] = {
#undef APUOPFB
};

const int spu_num_opcodes =
sizeof (spu_opcodes) / sizeof (spu_opcodes[0]);
const int spu_num_opcodes = ARRAY_SIZE(spu_opcodes);

0 comments on commit 3839a59

Please sign in to comment.