Merge branch 'pm-cpuidle'

[firefly-linux-kernel-4.4.55.git] / drivers / tty / hvc / hvc_console.h

diff --git a/drivers/tty/hvc/hvc_console.h b/drivers/tty/hvc/hvc_console.h
index c335a1492a54a0a73906feaea74c9bbf78fa3c14..91310198082736e0a5bffb75192b71aa1649764a 100644 (file)
--- a/drivers/tty/hvc/hvc_console.h
+++ b/drivers/tty/hvc/hvc_console.h
@@ -46,10 +46,9 @@
 #define HVC_ALLOC_TTY_ADAPTERS 8
 
 struct hvc_struct {
+       struct tty_port port;
        spinlock_t lock;
        int index;
-       struct tty_struct *tty;
-       int count;
        int do_wakeup;
        char *outbuf;
        int outbuf_size;
@@ -61,7 +60,6 @@ struct hvc_struct {
        struct winsize ws;
        struct work_struct tty_resize;
        struct list_head next;
-       struct kref kref; /* ref count & hvc_struct lifetime */
 };
 
 /* implemented by a low level driver */
@@ -77,6 +75,9 @@ struct hv_ops {
        /* tiocmget/set implementation */
        int (*tiocmget)(struct hvc_struct *hp);
        int (*tiocmset)(struct hvc_struct *hp, unsigned int set, unsigned int clear);
+
+       /* Callbacks to handle tty ports */
+       void (*dtr_rts)(struct hvc_struct *hp, int raise);
 };
 
 /* Register a vterm and a slot index for use as a console (console_init) */