tty: Ldisc revamp

Move the line disciplines towards a conventional ->ops arrangement.  For
the moment the actual 'tty_ldisc' struct in the tty is kept as part of
the tty struct but this can then be changed if it turns out that when it
all settles down we want to refcount ldiscs separately to the tty.

Pull the ldisc code out of /proc and put it with our ldisc code.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index e03eef2f2282..c2c10c632260 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -688,9 +688,9 @@ static void cpc_tty_rx_work(struct work_struct *work)
                                 if (cpc_tty->tty) {
                                         ld = tty_ldisc_ref(cpc_tty->tty);
                                         if (ld) {
-                                                if (ld->receive_buf) {
+                                                if (ld->ops->receive_buf) {
                                                         CPC_TTY_DBG("%s: call line disc. receive_buf\n",cpc_tty->name);
-                                                        ld->receive_buf(cpc_tty->tty, (char *)(buf->data), &flags, buf->size);
+                                                        ld->ops->receive_buf(cpc_tty->tty, (char *)(buf->data), &flags, buf->size);
                                                 }
                                                 tty_ldisc_deref(ld);
                                         }