This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / char / synclinkmp.c

diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 1361ea0..eec8815 100644 (file)
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -361,10 +361,6 @@ typedef struct _synclinkmp_info {
 #define TMCS   0x64
 #define TEPR   0x65
 
-/*
- *  FIXME: DAR here clashed with asm-ppc/reg.h and asm-sh/.../dma.h
- */
-#undef DAR
 /* DMA Controller Register macros */
 #define DAR    0x80
 #define DARL   0x80
@@ -800,7 +796,7 @@ static int open(struct tty_struct *tty, struct file *filp)
 cleanup:
        if (retval) {
                if (tty->count == 1)
-                       info->tty = NULL;/* tty layer will release tty struct */
+                       info->tty = 0; /* tty layer will release tty struct */
                if(info->count)
                        info->count--;
        }
@@ -875,7 +871,7 @@ static void close(struct tty_struct *tty, struct file *filp)
        shutdown(info);
 
        tty->closing = 0;
-       info->tty = NULL;
+       info->tty = 0;
 
        if (info->blocked_open) {
                if (info->close_delay) {
@@ -914,7 +910,7 @@ static void hangup(struct tty_struct *tty)
 
        info->count = 0;
        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-       info->tty = NULL;
+       info->tty = 0;
 
        wake_up_interruptible(&info->open_wait);
 }
@@ -2611,7 +2607,7 @@ static void shutdown(SLMP_INFO * info)
 
        if (info->tx_buf) {
                kfree(info->tx_buf);
-               info->tx_buf = NULL;
+               info->tx_buf = 0;
        }
 
        spin_lock_irqsave(&info->lock,flags);
@@ -3552,22 +3548,22 @@ void release_resources(SLMP_INFO *info)
 
        if (info->memory_base){
                iounmap(info->memory_base);
-               info->memory_base = NULL;
+               info->memory_base = 0;
        }
 
        if (info->sca_base) {
                iounmap(info->sca_base - info->sca_offset);
-               info->sca_base=NULL;
+               info->sca_base=0;
        }
 
        if (info->statctrl_base) {
                iounmap(info->statctrl_base - info->statctrl_offset);
-               info->statctrl_base=NULL;
+               info->statctrl_base=0;
        }
 
        if (info->lcr_base){
                iounmap(info->lcr_base - info->lcr_offset);
-               info->lcr_base = NULL;
+               info->lcr_base = 0;
        }
 
        if ( debug_level >= DEBUG_LEVEL_INFO )
@@ -5147,7 +5143,7 @@ int loopback_test(SLMP_INFO *info)
        u32 speed = info->params.clock_speed;
 
        info->params.clock_speed = 3686400;
-       info->tty = NULL;
+       info->tty = 0;
 
        /* assume failure */
        info->init_error = DiagStatus_DmaFailure;