Merge 4.1-rc4 into tty-next

[firefly-linux-kernel-4.4.55.git] / drivers / tty / n_gsm.c

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index c4343764cc5b7c527b85278013c3cbbb62f1cbd8..c408689a85a94b6ea941c834db76db3195a46079 100644 (file)
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2274,7 +2274,6 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
        const unsigned char *dp;
        char *f;
        int i;
-       char buf[64];
        char flags = TTY_NORMAL;
 
        if (debug & 4)
@@ -2296,7 +2295,7 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
                        break;
                default:
                        WARN_ONCE(1, "%s: unknown flag %d\n",
-                              tty_name(tty, buf), flags);
+                              tty_name(tty), flags);
                        break;
                }
        }
@@ -2669,7 +2668,7 @@ static inline void muxnet_put(struct gsm_mux_net *mux_net)
 static int gsm_mux_net_start_xmit(struct sk_buff *skb,
                                      struct net_device *net)
 {
-       struct gsm_mux_net *mux_net = (struct gsm_mux_net *)netdev_priv(net);
+       struct gsm_mux_net *mux_net = netdev_priv(net);
        struct gsm_dlci *dlci = mux_net->dlci;
        muxnet_get(mux_net);
 
@@ -2698,7 +2697,7 @@ static void gsm_mux_rx_netchar(struct gsm_dlci *dlci,
 {
        struct net_device *net = dlci->net;
        struct sk_buff *skb;
-       struct gsm_mux_net *mux_net = (struct gsm_mux_net *)netdev_priv(net);
+       struct gsm_mux_net *mux_net = netdev_priv(net);
        muxnet_get(mux_net);
 
        /* Allocate an sk_buff */
@@ -2727,7 +2726,7 @@ static void gsm_mux_rx_netchar(struct gsm_dlci *dlci,
 
 static int gsm_change_mtu(struct net_device *net, int new_mtu)
 {
-       struct gsm_mux_net *mux_net = (struct gsm_mux_net *)netdev_priv(net);
+       struct gsm_mux_net *mux_net = netdev_priv(net);
        if ((new_mtu < 8) || (new_mtu > mux_net->dlci->gsm->mtu))
                return -EINVAL;
        net->mtu = new_mtu;
@@ -2763,7 +2762,7 @@ static void gsm_destroy_network(struct gsm_dlci *dlci)
        pr_debug("destroy network interface");
        if (!dlci->net)
                return;
-       mux_net = (struct gsm_mux_net *)netdev_priv(dlci->net);
+       mux_net = netdev_priv(dlci->net);
        muxnet_put(mux_net);
 }
 
@@ -2801,7 +2800,7 @@ static int gsm_create_network(struct gsm_dlci *dlci, struct gsm_netconfig *nc)
                return -ENOMEM;
        }
        net->mtu = dlci->gsm->mtu;
-       mux_net = (struct gsm_mux_net *)netdev_priv(net);
+       mux_net = netdev_priv(net);
        mux_net->dlci = dlci;
        kref_init(&mux_net->ref);
        strncpy(nc->if_name, net->name, IFNAMSIZ); /* return net name */
@@ -2824,7 +2823,7 @@ static int gsm_create_network(struct gsm_dlci *dlci, struct gsm_netconfig *nc)
 }
 
 /* Line discipline for real tty */
-struct tty_ldisc_ops tty_ldisc_packet = {
+static struct tty_ldisc_ops tty_ldisc_packet = {
        .owner           = THIS_MODULE,
        .magic           = TTY_LDISC_MAGIC,
        .name            = "n_gsm",
@@ -3170,7 +3169,7 @@ static int gsmtty_break_ctl(struct tty_struct *tty, int state)
        return gsmtty_modem_update(dlci, encode);
 }
 
-static void gsmtty_remove(struct tty_driver *driver, struct tty_struct *tty)
+static void gsmtty_cleanup(struct tty_struct *tty)
 {
        struct gsm_dlci *dlci = tty->driver_data;
        struct gsm_mux *gsm = dlci->gsm;
@@ -3178,7 +3177,6 @@ static void gsmtty_remove(struct tty_driver *driver, struct tty_struct *tty)
        dlci_put(dlci);
        dlci_put(gsm->dlci[0]);
        mux_put(gsm);
-       driver->ttys[tty->index] = NULL;
 }
 
 /* Virtual ttys for the demux */
@@ -3199,7 +3197,7 @@ static const struct tty_operations gsmtty_ops = {
        .tiocmget               = gsmtty_tiocmget,
        .tiocmset               = gsmtty_tiocmset,
        .break_ctl              = gsmtty_break_ctl,
-       .remove                 = gsmtty_remove,
+       .cleanup                = gsmtty_cleanup,
 };