Skip to contentSkip to conversation

drivers/serial: remove BAUD_TABLE_SIZE macro.

PATCH In review Thiago Farina 4 participants 6 messages Nov 5, 2009 – Nov 11, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/serial: remove BAUD_TABLE_SIZE macro.

This macro is a duplicated of ARRAY_SIZE defined in kernel api, so just use it instead.

---
 drivers/serial/68328serial.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
drivers/serial/68328serial.c +4 -6
index d935b2d..d761109 100644
@@ -153,8 +153,6 @@ 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]))
-
 /* Sets or clears DTR/RTS on the requested line */
 static inline void m68k_rtsdtr(struct m68k_serial *ss, int set)
 {
@@ -1406,15 +1404,15 @@ 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 < ARRAY_SIZE(baud_table); i++)
 		if (baud_table[i] == m68328_console_baud)
 			break;
-	if (i >= sizeof(baud_table) / sizeof(baud_table[0])) {
+	if (i >= ARRAY_SIZE(baud_table)) {
 		m68328_console_baud = 9600;
 		goto again;
 	}
 
-	UBAUD = PUT_FIELD(UBAUD_DIVIDE,    hw_baud_table[i].divisor) | 
+	UBAUD = PUT_FIELD(UBAUD_DIVIDE,    hw_baud_table[i].divisor) |
 		PUT_FIELD(UBAUD_PRESCALER, hw_baud_table[i].prescale);
 	ustcnt &= ~(USTCNT_PARITYEN | USTCNT_ODD_EVEN | USTCNT_STOP | USTCNT_8_7);
 	ustcnt |= USTCNT_8_7;
@@ -1435,7 +1433,7 @@ int m68328_console_setup(struct console *cp, char *arg)
 	if (arg)
 		n = simple_strtoul(arg,NULL,0);
 
-	for (i = 0; i < BAUD_TABLE_SIZE; i++)
+	for (i = 0; i < ARRAY_SIZE(baud_table); i++)
 		if (baud_table[i] == n)
 			break;
 	if (i < BAUD_TABLE_SIZE) {
Signature · 1 line
1.6.5.1.61.ge79999
#2 lore raw
In reply to Thiago Farina
Quoted 5 lines · Thiago Farina

This macro is a duplicated of ARRAY_SIZE defined in kernel api, so just use it instead.

-       UBAUD = PUT_FIELD(UBAUD_DIVIDE,    hw_baud_table[i].divisor) |
+       UBAUD = PUT_FIELD(UBAUD_DIVIDE,    hw_baud_table[i].divisor) |

Random bit of whitespace got in the patch

Since nobody directly owns this file, CCing maintainers listed for serial_core

#3 lore raw
Quoted 8 lines · Harik
Quoted 5 lines · Thiago Farina

This macro is a duplicated of ARRAY_SIZE defined in kernel api, so just use it instead.

-       UBAUD = PUT_FIELD(UBAUD_DIVIDE,    hw_baud_table[i].divisor) |
+       UBAUD = PUT_FIELD(UBAUD_DIVIDE,    hw_baud_table[i].divisor) |

Random bit of whitespace got in the patch

What patch?

Quoted 1 line

Since nobody directly owns this file, CCing maintainers listed for serial_core

Sure, care to point me at a correct one?

thanks,

greg k-h

#4 lore raw
Quoted 11 lines · On Tue, 10 Nov 2009 16:11:00 -0800 Greg KH <[email protected]> wrote:
Quoted 8 lines · Harik
Quoted 5 lines · Thiago Farina

This macro is a duplicated of ARRAY_SIZE defined in kernel api, so just use it instead.

- __ __ __ UBAUD = PUT_FIELD(UBAUD_DIVIDE, __ __hw_baud_table[i].divisor) |
+ __ __ __ UBAUD = PUT_FIELD(UBAUD_DIVIDE, __ __hw_baud_table[i].divisor) |

Random bit of whitespace got in the patch

What patch?

That patch!

Quoted 3 lines
Quoted 1 line

Since nobody directly owns this file, CCing maintainers listed for serial_core

Sure, care to point me at a correct one?

I got it.

#5 lore raw
Quoted 1 line · Andrew Morton

I got it.

Thanks Andrew, sorry for the confusion about cc'ed people, that was because get_maintainer.pl does not return anyone, so I didn't know who should be copied. But will pay more attention on this next time.