Commit 3236133e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

tty: synclink_gt.c: move assignment out of if () block

We should not be doing assignments within an if () block
so fix up the code to not do this.

change was created using Coccinelle.

CC: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a271ca37
...@@ -1539,7 +1539,8 @@ static int hdlcdev_open(struct net_device *dev) ...@@ -1539,7 +1539,8 @@ static int hdlcdev_open(struct net_device *dev)
DBGINFO(("%s hdlcdev_open\n", dev->name)); DBGINFO(("%s hdlcdev_open\n", dev->name));
/* generic HDLC layer open processing */ /* generic HDLC layer open processing */
if ((rc = hdlc_open(dev))) rc = hdlc_open(dev);
if (rc)
return rc; return rc;
/* arbitrate between network and tty opens */ /* arbitrate between network and tty opens */
...@@ -1803,7 +1804,8 @@ static int hdlcdev_init(struct slgt_info *info) ...@@ -1803,7 +1804,8 @@ static int hdlcdev_init(struct slgt_info *info)
/* allocate and initialize network and HDLC layer objects */ /* 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 alloc failure\n", info->device_name); printk(KERN_ERR "%s hdlc device alloc failure\n", info->device_name);
return -ENOMEM; return -ENOMEM;
} }
...@@ -1824,7 +1826,8 @@ static int hdlcdev_init(struct slgt_info *info) ...@@ -1824,7 +1826,8 @@ static int hdlcdev_init(struct slgt_info *info)
hdlc->xmit = hdlcdev_xmit; hdlc->xmit = hdlcdev_xmit;
/* register objects with HDLC layer */ /* 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__); printk(KERN_WARNING "%s:unable to register hdlc device\n",__FILE__);
free_netdev(dev); free_netdev(dev);
return rc; return rc;
...@@ -1879,7 +1882,8 @@ static void rx_async(struct slgt_info *info) ...@@ -1879,7 +1882,8 @@ static void rx_async(struct slgt_info *info)
stat = 0; stat = 0;
if ((status = *(p+1) & (BIT1 + BIT0))) { status = *(p + 1) & (BIT1 + BIT0);
if (status) {
if (status & BIT1) if (status & BIT1)
icount->parity++; icount->parity++;
else if (status & BIT0) else if (status & BIT0)
...@@ -3755,7 +3759,8 @@ static void slgt_cleanup(void) ...@@ -3755,7 +3759,8 @@ static void slgt_cleanup(void)
if (serial_driver) { if (serial_driver) {
for (info=slgt_device_list ; info != NULL ; info=info->next_device) for (info=slgt_device_list ; info != NULL ; info=info->next_device)
tty_unregister_device(serial_driver, info->line); tty_unregister_device(serial_driver, info->line);
if ((rc = tty_unregister_driver(serial_driver))) rc = tty_unregister_driver(serial_driver);
if (rc)
DBGERR(("tty_unregister_driver error=%d\n", rc)); DBGERR(("tty_unregister_driver error=%d\n", rc));
put_tty_driver(serial_driver); put_tty_driver(serial_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment