xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / dev / arm / cons.c

diff --git a/bsd/dev/arm/cons.c b/bsd/dev/arm/cons.c
index 910c15257628ab709499689dee56c66ca1385929..5ac18e21907e030f12254bee4d202caa45821de9 100644 (file)
--- a/bsd/dev/arm/cons.c
+++ b/bsd/dev/arm/cons.c
@@ -3,9 +3,9 @@
  */
 /*
  * Copyright (c) 1987, 1988 NeXT, Inc.
- * 
+ *
  * HISTORY 7-Jan-93  Mac Gillon (mgillon) at NeXT Integrated POSIX support
- * 
+ *
  * 12-Aug-87  John Seamons (jks) at NeXT Ported to NeXT.
  */
 
@@ -20,7 +20,7 @@
 #include <sys/proc.h>
 #include <sys/uio.h>
 
-struct tty     *constty;               /* current console device */
+struct tty      *constty;               /* current console device */
 
 /*
  * The km driver supplied the default console device for the systems
@@ -41,17 +41,18 @@ int cnselect(__unused dev_t dev, int flag, void * wql, proc_t p);
 static dev_t
 cndev(void)
 {
-       if (constty)
+       if (constty) {
                return constty->t_dev;
-       else
+       } else {
                return km_tty[0]->t_dev;
+       }
 }
 
 int
 cnopen(__unused dev_t dev, int flag, int devtype, struct proc *pp)
 {
        dev = cndev();
-       return ((*cdevsw[major(dev)].d_open)(dev, flag, devtype, pp));
+       return (*cdevsw[major(dev)].d_open)(dev, flag, devtype, pp);
 }
 
 
@@ -59,7 +60,7 @@ int
 cnclose(__unused dev_t dev, int flag, int mode, struct proc *pp)
 {
        dev = cndev();
-       return ((*cdevsw[major(dev)].d_close)(dev, flag, mode, pp));
+       return (*cdevsw[major(dev)].d_close)(dev, flag, mode, pp);
 }
 
 
@@ -67,7 +68,7 @@ int
 cnread(__unused dev_t dev, struct uio *uio, int ioflag)
 {
        dev = cndev();
-       return ((*cdevsw[major(dev)].d_read)(dev, uio, ioflag));
+       return (*cdevsw[major(dev)].d_read)(dev, uio, ioflag);
 }
 
 
@@ -75,7 +76,7 @@ int
 cnwrite(__unused dev_t dev, struct uio *uio, int ioflag)
 {
        dev = cndev();
-       return ((*cdevsw[major(dev)].d_write)(dev, uio, ioflag));
+       return (*cdevsw[major(dev)].d_write)(dev, uio, ioflag);
 }
 
 
@@ -94,12 +95,13 @@ cnioctl(__unused dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
         */
        if ((unsigned) cmd == TIOCCONS && constty) {
                int             error = proc_suser(p);
-               if (error)
-                       return (error);
+               if (error) {
+                       return error;
+               }
                constty = NULL;
-               return (0);
+               return 0;
        }
-       return ((*cdevsw[major(dev)].d_ioctl)(dev, cmd, addr, flag, p));
+       return (*cdevsw[major(dev)].d_ioctl)(dev, cmd, addr, flag, p);
 }
 
 
@@ -107,5 +109,5 @@ int
 cnselect(__unused dev_t dev, int flag, void *wql, struct proc *p)
 {
        dev = cndev();
-       return ((*cdevsw[major(dev)].d_select)(dev, flag, wql, p));
+       return (*cdevsw[major(dev)].d_select)(dev, flag, wql, p);
 }