Merge git://git.infradead.org/users/cbou/battery-2.6.36

[platform/kernel/linux-starfive.git] / drivers / char / hvc_console.c

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 35cca4c..3afd62e 100644 (file)
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -194,7 +194,7 @@ static int __init hvc_console_setup(struct console *co, char *options)
        return 0;
 }
 
        return 0;
 }
 

-static struct console hvc_con_driver = {
+static struct console hvc_console = {

        .name           = "hvc",
        .write          = hvc_console_print,
        .device         = hvc_console_device,
        .name           = "hvc",
        .write          = hvc_console_print,
        .device         = hvc_console_device,


@@ -220,7 +220,7 @@ static struct console hvc_con_driver = {
  */
 static int __init hvc_console_init(void)
 {
  */
 static int __init hvc_console_init(void)
 {

-       register_console(&hvc_con_driver);
+       register_console(&hvc_console);

        return 0;
 }
 console_initcall(hvc_console_init);
        return 0;
 }
 console_initcall(hvc_console_init);


@@ -276,8 +276,8 @@ int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
         * now (setup won't fail at this point).  It's ok to just
         * call register again if previously .setup failed.
         */
         * now (setup won't fail at this point).  It's ok to just
         * call register again if previously .setup failed.
         */

-       if (index == hvc_con_driver.index)
-               register_console(&hvc_con_driver);
+       if (index == hvc_console.index)
+               register_console(&hvc_console);

 
        return 0;
 }
 
        return 0;
 }


@@ -641,7 +641,7 @@ int hvc_poll(struct hvc_struct *hp)
                }
                for (i = 0; i < n; ++i) {
 #ifdef CONFIG_MAGIC_SYSRQ
                }
                for (i = 0; i < n; ++i) {
 #ifdef CONFIG_MAGIC_SYSRQ

-                       if (hp->index == hvc_con_driver.index) {
+                       if (hp->index == hvc_console.index) {

                                /* Handle the SysRq Hack */
                                /* XXX should support a sequence */
                                if (buf[i] == '\x0f') { /* ^O */
                                /* Handle the SysRq Hack */
                                /* XXX should support a sequence */
                                if (buf[i] == '\x0f') { /* ^O */


@@ -651,7 +651,7 @@ int hvc_poll(struct hvc_struct *hp)
                                        if (sysrq_pressed)
                                                continue;
                                } else if (sysrq_pressed) {
                                        if (sysrq_pressed)
                                                continue;
                                } else if (sysrq_pressed) {

-                                       handle_sysrq(buf[i], tty);
+                                       handle_sysrq(buf[i]);

                                        sysrq_pressed = 0;
                                        continue;
                                }
                                        sysrq_pressed = 0;
                                        continue;
                                }


@@ -909,7 +909,7 @@ static void __exit hvc_exit(void)
                tty_unregister_driver(hvc_driver);
                /* return tty_struct instances allocated in hvc_init(). */
                put_tty_driver(hvc_driver);
                tty_unregister_driver(hvc_driver);
                /* return tty_struct instances allocated in hvc_init(). */
                put_tty_driver(hvc_driver);

-               unregister_console(&hvc_con_driver);
+               unregister_console(&hvc_console);

        }
 }
 module_exit(hvc_exit);
        }
 }
 module_exit(hvc_exit);