diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2006-08-15 03:05:38 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:54:45 -0400 |
commit | 9c3bd6833a4df1abd9ecd3b51492b8949bf9cd11 (patch) | |
tree | 6835d90852cd40289ad970b979b694ed55203e60 /drivers/net/irda/w83977af_ir.c | |
parent | 9a673e563e543a5c8a6f9824562e55e807b8a56c (diff) |
[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: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/w83977af_ir.c')
-rw-r--r-- | drivers/net/irda/w83977af_ir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 0ea65c4c6f85..8421597072a7 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c | |||
@@ -117,7 +117,7 @@ static int __init w83977af_init(void) | |||
117 | 117 | ||
118 | IRDA_DEBUG(0, "%s()\n", __FUNCTION__ ); | 118 | IRDA_DEBUG(0, "%s()\n", __FUNCTION__ ); |
119 | 119 | ||
120 | for (i=0; (io[i] < 2000) && (i < 4); i++) { | 120 | for (i=0; (io[i] < 2000) && (i < ARRAY_SIZE(dev_self)); i++) { |
121 | if (w83977af_open(i, io[i], irq[i], dma[i]) == 0) | 121 | if (w83977af_open(i, io[i], irq[i], dma[i]) == 0) |
122 | return 0; | 122 | return 0; |
123 | } | 123 | } |
@@ -136,7 +136,7 @@ static void __exit w83977af_cleanup(void) | |||
136 | 136 | ||
137 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 137 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); |
138 | 138 | ||
139 | for (i=0; i < 4; i++) { | 139 | for (i=0; i < ARRAY_SIZE(dev_self); i++) { |
140 | if (dev_self[i]) | 140 | if (dev_self[i]) |
141 | w83977af_close(dev_self[i]); | 141 | w83977af_close(dev_self[i]); |
142 | } | 142 | } |