diff options
author | Alejandro Martinez Ruiz <alex@flawedcode.org> | 2008-02-05 01:30:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:23 -0500 |
commit | 0a8320b04c0762a1c65b5800b84023b454c2da54 (patch) | |
tree | cc73c9304a5c4ca56e337683a44730724d6688d7 | |
parent | b9e5e119fd9905c2a06f73a96f9c18aa760a8a65 (diff) |
dio: ARRAY_SIZE() cleanup
[Geert: eliminate NUMNAMES, as suggested by Richard Knutsson ]
[akpm@linux-foundation.org: coding-syle fixes]
Signed-off-by: Alejandro Martinez Ruiz <alex@flawedcode.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/dio/dio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c index 17502d6efae7..07f274f853d9 100644 --- a/drivers/dio/dio.c +++ b/drivers/dio/dio.c | |||
@@ -88,8 +88,6 @@ static struct dioname names[] = | |||
88 | #undef DIONAME | 88 | #undef DIONAME |
89 | #undef DIOFBNAME | 89 | #undef DIOFBNAME |
90 | 90 | ||
91 | #define NUMNAMES (sizeof(names) / sizeof(struct dioname)) | ||
92 | |||
93 | static const char *unknowndioname | 91 | static const char *unknowndioname |
94 | = "unknown DIO board -- please email <linux-m68k@lists.linux-m68k.org>!"; | 92 | = "unknown DIO board -- please email <linux-m68k@lists.linux-m68k.org>!"; |
95 | 93 | ||
@@ -97,7 +95,7 @@ static const char *dio_getname(int id) | |||
97 | { | 95 | { |
98 | /* return pointer to a constant string describing the board with given ID */ | 96 | /* return pointer to a constant string describing the board with given ID */ |
99 | unsigned int i; | 97 | unsigned int i; |
100 | for (i = 0; i < NUMNAMES; i++) | 98 | for (i = 0; i < ARRAY_SIZE(names); i++) |
101 | if (names[i].id == id) | 99 | if (names[i].id == id) |
102 | return names[i].name; | 100 | return names[i].name; |
103 | 101 | ||