lkml.org 
[lkml]   [2010]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/36] serial: 68328serial.c: remove BAUD_TABLE_SIZE macro
    Date
    From: Thiago Farina <tfransosi@gmail.com>

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

    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/serial/68328serial.c | 8 +++-----
    1 files changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
    index d935b2d..ae0251e 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,10 +1404,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 < 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;
    }
    @@ -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.7.0.1


    \
     
     \ /
      Last update: 2010-03-03 00:55    [W:0.019 / U:1.132 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site