cpm_uart: fix whitespace issues

[linux-2.6-omap-h63xx.git] / drivers / serial / cpm_uart / cpm_uart.h

diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h
index a8f894c7819463cd30b39eafd1bc10032f135965..3d07bec06fadd553fb56499440b03cd4a0d2b9e1 100644 (file)
--- a/drivers/serial/cpm_uart/cpm_uart.h
+++ b/drivers/serial/cpm_uart/cpm_uart.h
@@ -6,7 +6,7 @@
  *  Copyright (C) 2004 Freescale Semiconductor, Inc.
  *
  *  2006 (c) MontaVista Software, Inc.
- *     Vitaly Bordug <vbordug@ru.mvista.com>
+ *     Vitaly Bordug <vbordug@ru.mvista.com>
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2. This program is licensed "as is" without any warranty of any
@@ -28,7 +28,7 @@
 #define SERIAL_CPM_MAJOR       204
 #define SERIAL_CPM_MINOR       46
 
-#define IS_SMC(pinfo)          (pinfo->flags & FLAG_SMC)
+#define IS_SMC(pinfo)          (pinfo->flags & FLAG_SMC)
 #define IS_DISCARDING(pinfo)   (pinfo->flags & FLAG_DISCARDING)
 #define FLAG_DISCARDING        0x00000004      /* when set, don't discard */
 #define FLAG_SMC       0x00000002
@@ -56,14 +56,14 @@ struct uart_cpm_port {
        u16                     rx_fifosize;
        u16                     tx_nrfifos;
        u16                     tx_fifosize;
-       smc_t                   *smcp;
-       smc_uart_t              *smcup;
-       scc_t                   *sccp;
-       scc_uart_t              *sccup;
-       volatile cbd_t          *rx_bd_base;
-       volatile cbd_t          *rx_cur;
-       volatile cbd_t          *tx_bd_base;
-       volatile cbd_t          *tx_cur;
+       smc_t __iomem           *smcp;
+       smc_uart_t __iomem      *smcup;
+       scc_t __iomem           *sccp;
+       scc_uart_t __iomem      *sccup;
+       cbd_t __iomem           *rx_bd_base;
+       cbd_t __iomem           *rx_cur;
+       cbd_t __iomem           *tx_bd_base;
+       cbd_t __iomem           *tx_cur;
        unsigned char           *tx_buf;
        unsigned char           *rx_buf;
        u32                     flags;
@@ -79,15 +79,22 @@ struct uart_cpm_port {
        /* Keep track of 'odd' SMC2 wirings */
        int                     is_portb;
        /* wait on close if needed */
-       int                     wait_closing;
+       int                     wait_closing;
+       /* value to combine with opcode to form cpm command */
+       u32                     command;
 };
 
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
 extern int cpm_uart_port_map[UART_NR];
+#endif
 extern int cpm_uart_nr;
 extern struct uart_cpm_port cpm_uart_ports[UART_NR];
 
 /* these are located in their respective files */
-void cpm_line_cr_cmd(int line, int cmd);
+void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd);
+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
+                               struct device_node *np);
+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram);
 int cpm_uart_init_portdesc(void);
 int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
@@ -102,34 +109,36 @@ void scc4_lineif(struct uart_cpm_port *pinfo);
 /*
    virtual to phys transtalion
 */
-static inline unsigned long cpu2cpm_addr(void* addr, struct uart_cpm_port *pinfo)
+static inline unsigned long cpu2cpm_addr(void *addr,
+                                         struct uart_cpm_port *pinfo)
 {
        int offset;
        u32 val = (u32)addr;
+       u32 mem = (u32)pinfo->mem_addr;
        /* sane check */
-       if (likely((val >= (u32)pinfo->mem_addr)) &&
-                       (val<((u32)pinfo->mem_addr + pinfo->mem_size))) {
-               offset = val - (u32)pinfo->mem_addr;
-               return pinfo->dma_addr+offset;
+       if (likely(val >= mem && val < mem + pinfo->mem_size)) {
+               offset = val - mem;
+               return pinfo->dma_addr + offset;
        }
        /* something nasty happened */
        BUG();
        return 0;
 }
 
-static inline void *cpm2cpu_addr(unsigned long addr, struct uart_cpm_port *pinfo)
+static inline void *cpm2cpu_addr(unsigned long addr,
+                                 struct uart_cpm_port *pinfo)
 {
        int offset;
        u32 val = addr;
+       u32 dma = (u32)pinfo->dma_addr;
        /* sane check */
-       if (likely((val >= pinfo->dma_addr) &&
-                       (val<(pinfo->dma_addr + pinfo->mem_size)))) {
-               offset = val - (u32)pinfo->dma_addr;
-               return (void*)(pinfo->mem_addr+offset);
+       if (likely(val >= dma && val < dma + pinfo->mem_size)) {
+               offset = val - dma;
+               return pinfo->mem_addr + offset;
        }
        /* something nasty happened */
        BUG();
-       return 0;
+       return NULL;
 }