Start to update

diff --git a/sys/dev/xen/console/xen_console.c b/sys/dev/xen/console/xen_console.c
index fc2aa0424b6492b2b145dda738122f9c4a8a6cc1..81079608092d9b67024148d21eee15899f139c82 100644 (file)
--- a/sys/dev/xen/console/xen_console.c
+++ b/sys/dev/xen/console/xen_console.c
@@ -99,7 +99,7 @@ struct xencons_priv {
  * Macros to use the console mutex
  *
  * The lock is not used when the kernel is panicing as it will never recover
- * and we want to output no matter it costs.
+ * and we want to output no matter what it costs.
  */
 #define CN_LOCK(cons)                                                  \
                do {                                                    \
@@ -205,8 +205,7 @@ xencons_init_hypervisor(device_t dev, struct tty *tp)
        int err;
 
        err = xen_intr_bind_virq(dev, VIRQ_CONSOLE, 0, NULL,
-                                xencons_intr, tp,
-                                INTR_TYPE_TTY, &cons->intr_handle);
+           xencons_intr, tp, INTR_TYPE_TTY, &cons->intr_handle);
        if (err)
                printf("Can't register console interrupt\n");
 
@@ -271,9 +270,8 @@ xencons_init_ring(device_t dev, struct tty *tp)
                return (ENODEV);
 
        err = xen_intr_bind_local_port(dev, cons->evtchn, NULL,
-                                      xencons_intr, tp,
-                                      INTR_TYPE_MISC | INTR_MPSAFE,
-                                      &cons->intr_handle);
+           xencons_intr, tp, INTR_TYPE_MISC | INTR_MPSAFE,
+           &cons->intr_handle);
        if (err != 0)
                return (err);
 
@@ -458,7 +456,7 @@ xencons_tx_flush(struct xencons_priv *cons, int force)
                if (sz > (WBUF_SIZE - WBUF_MASK(cons->wc)))
                        sz = WBUF_SIZE - WBUF_MASK(cons->wc);
                sent = xencons_write(cons, &cons->wbuf[WBUF_MASK(cons->wc)],
-                                    sz);
+                   sz);
 
                /*
                 * The other end may not have been initialized. Ignore
@@ -631,7 +629,7 @@ xencons_timeout(void *v)
 
        if (!xencons_tx(tp))
                callout_reset(&cons->callout, XC_POLLTIME,
-                             xencons_timeout, tp);
+                   xencons_timeout, tp);
 }
 
 static void
@@ -643,7 +641,7 @@ xctty_outwakeup(struct tty *tp)
 
        if (!xencons_tx(tp))
                callout_reset(&cons->callout, XC_POLLTIME,
-                             xencons_timeout, tp);
+                   xencons_timeout, tp);
 }
 
 static struct ttydevsw xc_ttydevsw = {
@@ -696,13 +694,13 @@ xc_attach(device_t dev)
        err = xencons_init(dev, tp);
        if (err) {
                printf("xencons: Unable to initialize the console (%d)\n",
-                      err);
+                   err);
                return err;
        }
 
        /* register handler to flush console on shutdown */
        if ((EVENTHANDLER_REGISTER(shutdown_post_sync, xencons_shutdown,
-                                  tp, SHUTDOWN_PRI_DEFAULT)) == NULL)
+           tp, SHUTDOWN_PRI_DEFAULT)) == NULL)
                printf("xencons: shutdown event registration failed!\n");
 
        return (0);