Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25b8ac3b authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Ralf Baechle
Browse files

[MIPS] Use ARRAY_SIZE macro when appropriate 



Signed-off-by: default avatarAhmed S. Darwish <darwish.07@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3e7f9b82

arch/mips/arc/identify.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct smatch * __init string_to_mach(const char *s) 
{

	int i;



	for (i = 0; i < (sizeof(mach_table) / sizeof (mach_table[0])); i++) {

	for (i = 0; i < ARRAY_SIZE(mach_table); i++) {

		if (!strcmp(s, mach_table[i].arcname))

			return &mach_table[i];

	}

arch/mips/jmr3927/rbhma3100/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ void __init tx3927_setup(void) 


	/* DMA */

	tx3927_dmaptr->mcr = 0;

	for (i = 0; i < sizeof(tx3927_dmaptr->ch) / sizeof(tx3927_dmaptr->ch[0]); i++) {

	for (i = 0; i < ARRAY_SIZE(tx3927_dmaptr->ch); i++) {

		/* reset channel */

		tx3927_dmaptr->ch[i].ccr = TX3927_DMA_CCR_CHRST;

		tx3927_dmaptr->ch[i].ccr = 0;

arch/mips/mips-boards/atlas/atlas_int.c

+3 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/kernel_stat.h>

#include <linux/kernel.h>



#include <asm/gdb-stub.h>

#include <asm/io.h>
@@ -220,7 +221,7 @@ msc_irqmap_t __initdata msc_irqmap[] = { 
	{MSC01C_INT_TMR,		MSC01_IRQ_EDGE, 0},

	{MSC01C_INT_PCI,		MSC01_IRQ_LEVEL, 0},

};

int __initdata msc_nr_irqs = sizeof(msc_irqmap) / sizeof(*msc_irqmap);

int __initdata msc_nr_irqs = ARRAY_SIZE(msc_irqmap);



msc_irqmap_t __initdata msc_eicirqmap[] = {

	{MSC01E_INT_SW0,		MSC01_IRQ_LEVEL, 0},
@@ -231,7 +232,7 @@ msc_irqmap_t __initdata msc_eicirqmap[] = { 
	{MSC01E_INT_PERFCTR,		MSC01_IRQ_LEVEL, 0},

	{MSC01E_INT_CPUCTR,		MSC01_IRQ_LEVEL, 0}

};

int __initdata msc_nr_eicirqs = sizeof(msc_eicirqmap) / sizeof(*msc_eicirqmap);

int __initdata msc_nr_eicirqs = ARRAY_SIZE(msc_eicirqmap);



void __init arch_init_irq(void)

{

arch/mips/mips-boards/malta/malta_int.c

+3 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/kernel_stat.h>

#include <linux/kernel.h>

#include <linux/random.h>



#include <asm/i8259.h>
@@ -289,7 +290,7 @@ msc_irqmap_t __initdata msc_irqmap[] = { 
	{MSC01C_INT_TMR,		MSC01_IRQ_EDGE, 0},

	{MSC01C_INT_PCI,		MSC01_IRQ_LEVEL, 0},

};

int __initdata msc_nr_irqs = sizeof(msc_irqmap)/sizeof(msc_irqmap_t);

int __initdata msc_nr_irqs = ARRAY_SIZE(msc_irqmap);



msc_irqmap_t __initdata msc_eicirqmap[] = {

	{MSC01E_INT_SW0,		MSC01_IRQ_LEVEL, 0},
@@ -303,7 +304,7 @@ msc_irqmap_t __initdata msc_eicirqmap[] = { 
	{MSC01E_INT_PERFCTR,		MSC01_IRQ_LEVEL, 0},

	{MSC01E_INT_CPUCTR,		MSC01_IRQ_LEVEL, 0}

};

int __initdata msc_nr_eicirqs = sizeof(msc_eicirqmap)/sizeof(msc_irqmap_t);

int __initdata msc_nr_eicirqs = ARRAY_SIZE(msc_eicirqmap);



void __init arch_init_irq(void)

{

arch/mips/pci/fixup-vr4133.c

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 */

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/kernel.h>



#include <asm/io.h>

#include <asm/i8259.h>
@@ -143,7 +144,7 @@ int rockhopper_get_irq(struct pci_dev *dev, u8 pin, u8 slot) 
	if (bus == NULL)

		return -1;



	for (i = 0; i < sizeof (int_map) / sizeof (int_map[0]); i++) {

	for (i = 0; i < ARRAY_SIZE(int_map); i++) {

		if (int_map[i].bus == bus->number && int_map[i].slot == slot) {

			int line;

			for (line = 0; line < 4; line++)