Messages in this thread Patch in this message | | | Date | Sun, 25 May 2008 07:37:03 -0400 (EDT) | From | "Robert P. J. Day" <> | Subject | [PATCH] SERIAL: Simplify code using ARRAY_SIZE() macro. |
| |
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
---
drivers/serial/68328serial.c | 6 +++--- drivers/serial/mcfserial.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index bbf5bc5..71c56c1 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c @@ -154,7 +154,7 @@ static int baud_table[] = { 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 0 };
-#define BAUD_TABLE_SIZE (sizeof(baud_table)/sizeof(baud_table[0])) +#define BAUD_TABLE_SIZE ARRAY_SIZE(baud_table)
/* Sets or clears DTR/RTS on the requested line */ static inline void m68k_rtsdtr(struct m68k_serial *ss, int set) @@ -1413,10 +1413,10 @@ static void m68328_set_baud(void) USTCNT = ustcnt & ~USTCNT_TXEN;
again: - for (i = 0; i < sizeof(baud_table) / sizeof(baud_table[0]); i++) + for (i = 0; i < BAUD_TABLE_SIZE); i++) if (baud_table[i] == m68328_console_baud) break; - if (i >= sizeof(baud_table) / sizeof(baud_table[0])) { + if (i >= BAUD_TABLE_SIZE) { m68328_console_baud = 9600; goto again; } diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c index 56007cc..a0699ba 100644 --- a/drivers/serial/mcfserial.c +++ b/drivers/serial/mcfserial.c @@ -137,7 +137,7 @@ static struct mcf_serial mcfrs_table[] = { };
-#define NR_PORTS (sizeof(mcfrs_table) / sizeof(struct mcf_serial)) +#define NR_PORTS ARRAY_SIZE(mcfrs_table)
/* * This is used to figure out the divisor speeds and the timeouts. @@ -146,8 +146,7 @@ static int mcfrs_baud_table[] = { 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400, 460800, 0 }; -#define MCFRS_BAUD_TABLE_SIZE \ - (sizeof(mcfrs_baud_table)/sizeof(mcfrs_baud_table[0])) +#define MCFRS_BAUD_TABLE_SIZE ARRAY_SIZE(mcfrs_baud_table)
#ifdef CONFIG_MAGIC_SYSRQ
======================================================================== Robert P. J. Day Linux Consulting, Training and Annoying Kernel Pedantry: Have classroom, will lecture. http://crashcourse.ca Waterloo, Ontario, CANADA ========================================================================
| |