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

Commit 9c3bd683 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by David S. Miller
Browse files

[IRDA]: Replace hard-coded dev_self[] array sizes with ARRAY_SIZE() 



Several IR drivers used "for (i = 0; i < 4; i++)" to walk their
dev_self[] table.  Better to use ARRAY_SIZE().  And fix ali-ircc so it
won't run off the end if we find too many adapters.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a673e56

drivers/net/irda/ali-ircc.c

+7 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static void __exit ali_ircc_cleanup(void) 


	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);	



	for (i=0; i < 4; i++) {

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

		if (dev_self[i])

			ali_ircc_close(dev_self[i]);

	}
@@ -274,6 +274,12 @@ static int ali_ircc_open(int i, chipio_t *info) 
			

	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);	



	if (i >= ARRAY_SIZE(dev_self)) {

		IRDA_ERROR("%s(), maximum number of supported chips reached!\n",

			   __FUNCTION__);

		return -ENOMEM;

	}

	

	/* Set FIR FIFO and DMA Threshold */

	if ((ali_ircc_setup(info)) == -1)

		return -1;

drivers/net/irda/irport.c

+2 −2
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ static int __init irport_init(void) 
{

 	int i;



 	for (i=0; (io[i] < 2000) && (i < 4); i++) {

 	for (i=0; (io[i] < 2000) && (i < ARRAY_SIZE(dev_self)); i++) {

 		if (irport_open(i, io[i], irq[i]) != NULL)

 			return 0;

 	}
@@ -1112,7 +1112,7 @@ static void __exit irport_cleanup(void) 


        IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);



	for (i=0; i < 4; i++) {

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

 		if (dev_self[i])

 			irport_close(dev_self[i]);

 	}

drivers/net/irda/via-ircc.c

+4 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void via_ircc_clean(void) 


	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);



	for (i=0; i < 4; i++) {

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

		if (dev_self[i])

			via_ircc_close(dev_self[i]);

	}
@@ -327,6 +327,9 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id) 


	IRDA_DEBUG(3, "%s()\n", __FUNCTION__);



	if (i >= ARRAY_SIZE(dev_self))

		return -ENOMEM;



	/* Allocate new instance of the driver */

	dev = alloc_irdadev(sizeof(struct via_ircc_cb));

	if (dev == NULL)

drivers/net/irda/w83977af_ir.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int __init w83977af_init(void) 


	IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );



	for (i=0; (io[i] < 2000) && (i < 4); i++) { 

	for (i=0; (io[i] < 2000) && (i < ARRAY_SIZE(dev_self)); i++) {

		if (w83977af_open(i, io[i], irq[i], dma[i]) == 0)

			return 0;

	}
@@ -136,7 +136,7 @@ static void __exit w83977af_cleanup(void) 


        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );



	for (i=0; i < 4; i++) {

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

		if (dev_self[i])

			w83977af_close(dev_self[i]);

	}