vserver 1.9.5.x5

[linux-2.6.git] / drivers / char / rio / rioctrl.c

diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c
index 7a74e2c..b4d1a23 100644 (file)
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/char/rio/rioctrl.c
@@ -130,7 +130,6 @@ static int
 
 #define drv_makedev(maj, min) ((((uint) maj & 0xff) << 8) | ((uint) min & 0xff))
 
-#ifdef linux
 int copyin (int arg, caddr_t dp, int siz)
 {
   int rv;
@@ -141,8 +140,7 @@ int copyin (int arg, caddr_t dp, int siz)
   else return rv;
 }
 
-
-int copyout (caddr_t dp, int arg, int siz)
+static int copyout (caddr_t dp, int arg, int siz)
 {
   int rv;
 
@@ -152,35 +150,6 @@ int copyout (caddr_t dp, int arg, int siz)
   else return rv;
 }
 
-#else
-
-int
-copyin(arg, dp, siz)
-int arg;
-caddr_t dp;
-int siz; 
-{
-       if (rbounds ((unsigned long) arg) >= siz) {
-               bcopy ( arg, dp, siz );
-               return OK;
-       } else
-               return ( COPYFAIL );
-}
-
-int
-copyout (dp, arg, siz)
-caddr_t dp;
-int arg;
-int siz;
-{
-       if (wbounds ((unsigned long) arg) >=  siz ) {
-               bcopy ( dp, arg, siz );
-               return OK;
-       } else
-               return ( COPYFAIL );
-}
-#endif
-
 int
 riocontrol(p, dev, cmd, arg, su)
 struct rio_info        * p;
@@ -1203,7 +1172,7 @@ RIO_DEBUG_CTRL,                           if (su)
                                        p->RIOPortp[loop]->TtyP = &p->channel[loop];
 #endif
                                        
-                                       p->RIOPortp[loop]->portSem = SPIN_LOCK_UNLOCKED;
+                                       spin_lock_init(&p->RIOPortp[loop]->portSem);
                                        p->RIOPortp[loop]->InUse = NOT_INUSE;
                                }