diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 16:34:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 16:34:49 +0200 |
| commit | 4758ee8bc89a86c2110b9e85878538ced8045ef5 (patch) | |
| tree | 69539cae6631b1981fb23b51e01566f9e84f635d /0010-mpsc.c-move-assignment-out-of-if-block.patch | |
| parent | 02611ede94f297e19bea81ddf41425a24569a545 (diff) | |
| download | patches-4758ee8bc89a86c2110b9e85878538ced8045ef5.tar.gz | |
add new patch and remove ones that were long ago merged
Diffstat (limited to '0010-mpsc.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0010-mpsc.c-move-assignment-out-of-if-block.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/0010-mpsc.c-move-assignment-out-of-if-block.patch b/0010-mpsc.c-move-assignment-out-of-if-block.patch deleted file mode 100644 index a5914092fa671a..00000000000000 --- a/0010-mpsc.c-move-assignment-out-of-if-block.patch +++ /dev/null @@ -1,80 +0,0 @@ -From ef42121bf5e347941ee421f78f351d76f4b8ed84 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 29 Apr 2015 16:22:07 +0200 -Subject: [PATCH 10/36] tty: mpsc.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/tty/serial/mpsc.c | 25 ++++++++++++++++--------- - 1 file changed, 16 insertions(+), 9 deletions(-) - -diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c -index 856fd5a5fa3c..82bb6d1fe23b 100644 ---- a/drivers/tty/serial/mpsc.c -+++ b/drivers/tty/serial/mpsc.c -@@ -913,7 +913,8 @@ static int mpsc_make_ready(struct mpsc_port_info *pi) - - if (!pi->ready) { - mpsc_init_hw(pi); -- if ((rc = mpsc_alloc_ring_mem(pi))) -+ rc = mpsc_alloc_ring_mem(pi); -+ if (rc) - return rc; - mpsc_init_rings(pi); - pi->ready = 1; -@@ -1895,7 +1896,8 @@ static int mpsc_shared_drv_probe(struct platform_device *dev) - int rc = -ENODEV; - - if (dev->id == 0) { -- if (!(rc = mpsc_shared_map_regs(dev))) { -+ rc = mpsc_shared_map_regs(dev); -+ if (!rc) { - pdata = (struct mpsc_shared_pdata *) - dev_get_platdata(&dev->dev); - -@@ -2081,14 +2083,16 @@ static int mpsc_drv_probe(struct platform_device *dev) - if (dev->id < MPSC_NUM_CTLRS) { - pi = &mpsc_ports[dev->id]; - -- if (!(rc = mpsc_drv_map_regs(pi, dev))) { -+ rc = mpsc_drv_map_regs(pi, dev); -+ if (!rc) { - mpsc_drv_get_platform_data(pi, dev, dev->id); - pi->port.dev = &dev->dev; - -- if (!(rc = mpsc_make_ready(pi))) { -+ rc = mpsc_make_ready(pi); -+ if (!rc) { - spin_lock_init(&pi->tx_lock); -- if (!(rc = uart_add_one_port(&mpsc_reg, -- &pi->port))) { -+ rc = uart_add_one_port(&mpsc_reg, &pi->port); -+ if (!rc) { - rc = 0; - } else { - mpsc_release_port((struct uart_port *) -@@ -2136,9 +2140,12 @@ static int __init mpsc_drv_init(void) - memset(mpsc_ports, 0, sizeof(mpsc_ports)); - memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs)); - -- if (!(rc = uart_register_driver(&mpsc_reg))) { -- if (!(rc = platform_driver_register(&mpsc_shared_driver))) { -- if ((rc = platform_driver_register(&mpsc_driver))) { -+ rc = uart_register_driver(&mpsc_reg); -+ if (!rc) { -+ rc = platform_driver_register(&mpsc_shared_driver); -+ if (!rc) { -+ rc = platform_driver_register(&mpsc_driver); -+ if (rc) { - platform_driver_unregister(&mpsc_shared_driver); - uart_unregister_driver(&mpsc_reg); - } --- -2.3.7 - |