lkml.org 
[lkml]   [2005]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 10/16] sh: hd64465: minmax-removal
    From: Michael Veeck <michael.veeck@gmx.net>



    Patch removes unnecessary min/max macros and changes
    calls to use kernel.h macros instead.

    Signed-off-by: Michael Veeck <michael.veeck@gmx.net>
    Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    ---
    io.c | 8 ++------
    1 files changed, 2 insertions(+), 6 deletions(-)

    Index: quilt/arch/sh/cchips/hd6446x/hd64465/io.c
    ===================================================================
    --- quilt.orig/arch/sh/cchips/hd6446x/hd64465/io.c
    +++ quilt/arch/sh/cchips/hd6446x/hd64465/io.c
    @@ -48,10 +48,6 @@ static unsigned char hd64465_iomap_lo_sh
    static unsigned long hd64465_iomap_hi[HD64465_IOMAP_HI_NMAP];
    static unsigned char hd64465_iomap_hi_shift[HD64465_IOMAP_HI_NMAP];

    -#ifndef MAX
    -#define MAX(a,b) ((a)>(b)?(a):(b))
    -#endif
    -
    #define PORT2ADDR(x) (sh_mv.mv_isa_port2addr(x))

    void hd64465_port_map(unsigned short baseport, unsigned int nports,
    @@ -71,7 +67,7 @@ void hd64465_port_map(unsigned short bas
    addr += (1<<(HD64465_IOMAP_LO_SHIFT));
    }

    - for (port = MAX(baseport, HD64465_IOMAP_LO_THRESH) ;
    + for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH);
    port < endport && port < HD64465_IOMAP_HI_THRESH ;
    port += (1<<HD64465_IOMAP_HI_SHIFT)) {
    DPRINTK(" maphi[0x%x] = 0x%08lx\n", port, addr);
    @@ -95,7 +91,7 @@ void hd64465_port_unmap(unsigned short b
    hd64465_iomap_lo[port>>HD64465_IOMAP_LO_SHIFT] = 0;
    }

    - for (port = MAX(baseport, HD64465_IOMAP_LO_THRESH) ;
    + for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH);
    port < endport && port < HD64465_IOMAP_HI_THRESH ;
    port += (1<<HD64465_IOMAP_HI_SHIFT)) {
    hd64465_iomap_hi[port>>HD64465_IOMAP_HI_SHIFT] = 0;
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-08-09 00:33    [W:2.492 / U:0.664 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site