These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / tty / synclink.c

diff --git a/kernel/drivers/tty/synclink.c b/kernel/drivers/tty/synclink.c
index b799170..6188059 100644 (file)
--- a/kernel/drivers/tty/synclink.c
+++ b/kernel/drivers/tty/synclink.c
@@ -3314,12 +3314,11 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                                        -EAGAIN : -ERESTARTSYS;
                        break;
                }
-               
+
                dcd = tty_port_carrier_raised(&info->port);
-               
-               if (!(port->flags & ASYNC_CLOSING) && (do_clocal || dcd))
-                       break;
-                       
+               if (do_clocal || dcd)
+                       break;
+
                if (signal_pending(current)) {
                        retval = -ERESTARTSYS;
                        break;
@@ -3398,15 +3397,6 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
                printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
                         __FILE__,__LINE__,tty->driver->name, info->port.count);
 
-       /* If port is closing, signal caller to try again */
-       if (info->port.flags & ASYNC_CLOSING){
-               wait_event_interruptible_tty(tty, info->port.close_wait,
-                                    !(info->port.flags & ASYNC_CLOSING));
-               retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
-                       -EAGAIN : -ERESTARTSYS);
-               goto cleanup;
-       }
-       
        info->port.low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
        spin_lock_irqsave(&info->netlock, flags);
@@ -4410,7 +4400,8 @@ static void synclink_cleanup(void)
        printk("Unloading %s: %s\n", driver_name, driver_version);
 
        if (serial_driver) {
-               if ((rc = tty_unregister_driver(serial_driver)))
+               rc = tty_unregister_driver(serial_driver);
+               if (rc)
                        printk("%s(%d) failed to unregister tty driver err=%d\n",
                               __FILE__,__LINE__,rc);
                put_tty_driver(serial_driver);
@@ -6634,7 +6625,7 @@ static bool mgsl_get_rx_frame(struct mgsl_struct *info)
                        unsigned char *ptmp = info->intermediate_rxbuffer;
 
                        if ( !(status & RXSTATUS_CRC_ERROR))
-                       info->icount.rxok++;
+                               info->icount.rxok++;
                        
                        while(copy_count) {
                                int partial_count;
@@ -7751,7 +7742,8 @@ static int hdlcdev_open(struct net_device *dev)
                printk("%s:hdlcdev_open(%s)\n",__FILE__,dev->name);
 
        /* generic HDLC layer open processing */
-       if ((rc = hdlc_open(dev)))
+       rc = hdlc_open(dev);
+       if (rc)
                return rc;
 
        /* arbitrate between network and tty opens */
@@ -8018,7 +8010,8 @@ static int hdlcdev_init(struct mgsl_struct *info)
 
        /* allocate and initialize network and HDLC layer objects */
 
-       if (!(dev = alloc_hdlcdev(info))) {
+       dev = alloc_hdlcdev(info);
+       if (!dev) {
                printk(KERN_ERR "%s:hdlc device allocation failure\n",__FILE__);
                return -ENOMEM;
        }
@@ -8039,7 +8032,8 @@ static int hdlcdev_init(struct mgsl_struct *info)
        hdlc->xmit   = hdlcdev_xmit;
 
        /* register objects with HDLC layer */
-       if ((rc = register_hdlc_device(dev))) {
+       rc = register_hdlc_device(dev);
+       if (rc) {
                printk(KERN_WARNING "%s:unable to register hdlc device\n",__FILE__);
                free_netdev(dev);
                return rc;
@@ -8075,7 +8069,8 @@ static int synclink_init_one (struct pci_dev *dev,
                return -EIO;
        }
 
-       if (!(info = mgsl_allocate_device())) {
+       info = mgsl_allocate_device();
+       if (!info) {
                printk("can't allocate device instance data.\n");
                return -EIO;
        }