2009-11-05 13:46:47

by Thiago Farina

[permalink] [raw]
Subject: [PATCH] drivers/serial: remove BAUD_TABLE_SIZE macro.

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

Signed-off-by: Thiago Farina <[email protected]>
---
drivers/serial/68328serial.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index d935b2d..d761109 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -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) {
--
1.6.5.1.61.ge79999


2009-11-11 00:09:26

by Harik

[permalink] [raw]
Subject: Re: [PATCH] drivers/serial: remove BAUD_TABLE_SIZE macro.

On Thu, Nov 5, 2009 at 8:46 AM, Thiago Farina <[email protected]> wrote:
> 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

2009-11-11 00:16:55

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH] drivers/serial: remove BAUD_TABLE_SIZE macro.

On Tue, Nov 10, 2009 at 07:09:30PM -0500, Harik wrote:
> On Thu, Nov 5, 2009 at 8:46 AM, Thiago Farina <[email protected]> wrote:
> > 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?

> 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

2009-11-11 00:29:58

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH] drivers/serial: remove BAUD_TABLE_SIZE macro.

On Tue, 10 Nov 2009 16:11:00 -0800
Greg KH <[email protected]> wrote:

> On Tue, Nov 10, 2009 at 07:09:30PM -0500, Harik wrote:
> > On Thu, Nov 5, 2009 at 8:46 AM, Thiago Farina <[email protected]> wrote:
> > > 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!

> > Since nobody directly owns this file, CCing maintainers listed for serial_core
>
> Sure, care to point me at a correct one?

I got it.

2009-11-11 12:18:58

by Thiago Farina

[permalink] [raw]
Subject: Re: [PATCH] drivers/serial: remove BAUD_TABLE_SIZE macro.

On Tue, Nov 10, 2009 at 10:29 PM, Andrew Morton
<[email protected]> wrote:
> 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.