diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
| commit | 24b1c251dfcd02877c40d7e52288c9bc2dc7ff35 (patch) | |
| tree | 8fb3d4332168686f601f58b23815910799b1699f | |
| parent | 71c7e32cd1509d46be836ed19dfe63e217eae8d4 (diff) | |
| download | patches-24b1c251dfcd02877c40d7e52288c9bc2dc7ff35.tar.gz | |
updates and new patches
42 files changed, 2159 insertions, 26 deletions
diff --git a/0001-iop.c-move-assignment-out-of-if-block.patch b/0001-iop.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..45a8f39854488f --- /dev/null +++ b/0001-iop.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,50 @@ +From 9640c5c953103d87f30d548274bc4e6d8ac3e549 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:21:59 +0200 +Subject: [PATCH 01/36] iop.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: Supriya Karanth <iskaranth@gmail.com> +CC: Somya Anand <somyaanand214@gmail.com> +CC: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/staging/i2o/iop.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +--- a/drivers/staging/i2o/iop.c ++++ b/drivers/staging/i2o/iop.c +@@ -300,7 +300,8 @@ static int i2o_iop_quiesce(struct i2o_co + ADAPTER_TID); + + /* Long timeout needed for quiesce if lots of devices */ +- if ((rc = i2o_msg_post_wait(c, msg, 240))) ++ rc = i2o_msg_post_wait(c, msg, 240); ++ if (rc) + osm_info("%s: Unable to quiesce (status=%#x).\n", c->name, -rc); + else + osm_debug("%s: Quiesced.\n", c->name); +@@ -340,7 +341,8 @@ static int i2o_iop_enable(struct i2o_con + ADAPTER_TID); + + /* How long of a timeout do we need? */ +- if ((rc = i2o_msg_post_wait(c, msg, 240))) ++ rc = i2o_msg_post_wait(c, msg, 240); ++ if (rc) + osm_err("%s: Could not enable (status=%#x).\n", c->name, -rc); + else + osm_debug("%s: Enabled.\n", c->name); +@@ -406,7 +408,8 @@ static int i2o_iop_clear(struct i2o_cont + cpu_to_le32(I2O_CMD_ADAPTER_CLEAR << 24 | HOST_TID << 12 | + ADAPTER_TID); + +- if ((rc = i2o_msg_post_wait(c, msg, 30))) ++ rc = i2o_msg_post_wait(c, msg, 30); ++ if (rc) + osm_info("%s: Unable to clear (status=%#x).\n", c->name, -rc); + else + osm_debug("%s: Cleared.\n", c->name); diff --git a/0002-amiserial.c-move-assignment-out-of-if-block.patch b/0002-amiserial.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..89bdd2e88e0f0f --- /dev/null +++ b/0002-amiserial.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,28 @@ +From 7d99b4864316e37368a83069907302cabc1a9f62 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:00 +0200 +Subject: [PATCH 02/36] amiserial.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/amiserial.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/tty/amiserial.c ++++ b/drivers/tty/amiserial.c +@@ -1786,7 +1786,8 @@ static int __exit amiga_serial_remove(st + struct serial_state *state = platform_get_drvdata(pdev); + + /* printk("Unloading %s: version %s\n", serial_name, serial_version); */ +- if ((error = tty_unregister_driver(serial_driver))) ++ error = tty_unregister_driver(serial_driver); ++ if (error) + printk("SERIAL: failed to unregister serial driver (%d)\n", + error); + put_tty_driver(serial_driver); diff --git a/0003-hvc_console.c-move-assignment-out-of-if-block.patch b/0003-hvc_console.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..51993ca386d9d2 --- /dev/null +++ b/0003-hvc_console.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,35 @@ +From 653778364ba17237ea794ab00e92ed04b98aec42 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:02 +0200 +Subject: [PATCH 03/36] hvc_console.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> +CC: Tomoki Sekiyama <tomoki.sekiyama@hds.com> +CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/tty/hvc/hvc_console.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c +index 4fcec1d793a7..4e9c4cc9e1b5 100644 +--- a/drivers/tty/hvc/hvc_console.c ++++ b/drivers/tty/hvc/hvc_console.c +@@ -319,7 +319,8 @@ static int hvc_install(struct tty_driver *driver, struct tty_struct *tty) + int rc; + + /* Auto increments kref reference if found. */ +- if (!(hp = hvc_get_by_index(tty->index))) ++ hp = hvc_get_by_index(tty->index); ++ if (!hp) + return -ENODEV; + + tty->driver_data = hp; +-- +2.3.7 + diff --git a/0004-hvcs.c-move-assignment-out-of-if-block.patch b/0004-hvcs.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..f00458631b80a0 --- /dev/null +++ b/0004-hvcs.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,35 @@ +From c7e61966f54c02d32a22e523c55d13a7b5304c3b Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:04 +0200 +Subject: [PATCH 04/36] hvcs.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> +CC: Masanari Iida <standby24x7@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/tty/hvc/hvcs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c +index 81ff7e1bfb1a..f7ff97c0ad34 100644 +--- a/drivers/tty/hvc/hvcs.c ++++ b/drivers/tty/hvc/hvcs.c +@@ -1044,8 +1044,8 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address, + * It is possible that the vty-server was removed between the time that + * the conn was registered and now. + */ +- if (!(rc = request_irq(irq, &hvcs_handle_interrupt, +- 0, "ibmhvcs", hvcsd))) { ++ rc = request_irq(irq, &hvcs_handle_interrupt, 0, "ibmhvcs", hvcsd); ++ if (!rc) { + /* + * It is possible the vty-server was removed after the irq was + * requested but before we have time to enable interrupts. +-- +2.3.7 + diff --git a/0005-68328serial.c-move-assignment-out-of-if-block.patch b/0005-68328serial.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..bbab820af0c814 --- /dev/null +++ b/0005-68328serial.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From 5ce8eba21f28738d0fb9359897d893efd99c1c50 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:05 +0200 +Subject: [PATCH 05/36] 68328serial.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/68328serial.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c +index 5dc9c4bfa66e..748c18f8c8cd 100644 +--- a/drivers/tty/serial/68328serial.c ++++ b/drivers/tty/serial/68328serial.c +@@ -508,7 +508,8 @@ static void change_speed(struct m68k_serial *info, struct tty_struct *tty) + int i; + + cflag = tty->termios.c_cflag; +- if (!(port = info->port)) ++ port = info->port; ++ if (!port) + return; + + ustcnt = uart->ustcnt; +-- +2.3.7 + diff --git a/0006-crisv10.c-move-assignment-out-of-if-block.patch b/0006-crisv10.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..0c1b094d24ad8e --- /dev/null +++ b/0006-crisv10.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,65 @@ +From 9a3031c4490510d4a860f857526293f6638528a1 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:05 +0200 +Subject: [PATCH 06/36] crisv10.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: Mikael Starvik <starvik@axis.com> +CC: Jesper Nilsson <jesper.nilsson@axis.com> +CC: Jiri Slaby <jslaby@suse.cz> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/tty/serial/crisv10.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c +index 0c1825b0b41d..135021314a71 100644 +--- a/drivers/tty/serial/crisv10.c ++++ b/drivers/tty/serial/crisv10.c +@@ -1676,7 +1676,8 @@ alloc_recv_buffer(unsigned int size) + { + struct etrax_recv_buffer *buffer; + +- if (!(buffer = kmalloc(sizeof *buffer + size, GFP_ATOMIC))) ++ buffer = kmalloc(sizeof *buffer + size, GFP_ATOMIC); ++ if (!buffer) + return NULL; + + buffer->next = NULL; +@@ -1712,7 +1713,8 @@ add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char fl + { + struct etrax_recv_buffer *buffer; + if (info->uses_dma_in) { +- if (!(buffer = alloc_recv_buffer(4))) ++ buffer = alloc_recv_buffer(4); ++ if (!buffer) + return 0; + + buffer->length = 1; +@@ -1750,7 +1752,8 @@ static unsigned int handle_descr_data(struct e100_serial *info, + + append_recv_buffer(info, buffer); + +- if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE))) ++ buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE); ++ if (!buffer) + panic("%s: Failed to allocate memory for receive buffer!\n", __func__); + + descr->buf = virt_to_phys(buffer->buffer); +@@ -1867,7 +1870,8 @@ static int start_recv_dma(struct e100_serial *info) + + /* Set up the receiving descriptors */ + for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++) { +- if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE))) ++ buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE); ++ if (!buffer) + panic("%s: Failed to allocate memory for receive buffer!\n", __func__); + + descr[i].ctrl = d_int; +-- +2.3.7 + diff --git a/0007-icom.c-move-assignment-out-of-if-block.patch b/0007-icom.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..7cfb77a8e8ea87 --- /dev/null +++ b/0007-icom.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,55 @@ +From 1f917aadd8a9092baf8f9112951e27334764af1f Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:06 +0200 +Subject: [PATCH 07/36] icom.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/icom.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c +index 45fc323b95e6..ffc7cb2585a6 100644 +--- a/drivers/tty/serial/icom.c ++++ b/drivers/tty/serial/icom.c +@@ -1504,7 +1504,8 @@ static int icom_probe(struct pci_dev *dev, + return retval; + } + +- if ( (retval = pci_request_regions(dev, "icom"))) { ++ retval = pci_request_regions(dev, "icom"); ++ if (retval) { + dev_err(&dev->dev, "pci_request_regions FAILED\n"); + pci_disable_device(dev); + return retval; +@@ -1512,7 +1513,8 @@ static int icom_probe(struct pci_dev *dev, + + pci_set_master(dev); + +- if ( (retval = pci_read_config_dword(dev, PCI_COMMAND, &command_reg))) { ++ retval = pci_read_config_dword(dev, PCI_COMMAND, &command_reg); ++ if (retval) { + dev_err(&dev->dev, "PCI Config read FAILED\n"); + return retval; + } +@@ -1556,9 +1558,8 @@ static int icom_probe(struct pci_dev *dev, + } + + /* save off irq and request irq line */ +- if ( (retval = request_irq(dev->irq, icom_interrupt, +- IRQF_SHARED, ICOM_DRIVER_NAME, +- (void *) icom_adapter))) { ++ retval = request_irq(dev->irq, icom_interrupt, IRQF_SHARED, ICOM_DRIVER_NAME, (void *)icom_adapter); ++ if (retval) { + goto probe_exit2; + } + +-- +2.3.7 + diff --git a/0008-ioc3_serial.c-move-assignment-out-of-if-block.patch b/0008-ioc3_serial.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..8fb9794a910c18 --- /dev/null +++ b/0008-ioc3_serial.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,34 @@ +From cdf92482f0381097283312e3e2d0781d6333ab8d Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:06 +0200 +Subject: [PATCH 08/36] ioc3_serial.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: Pat Gefre <pfg@sgi.com> +CC: Jiri Slaby <jslaby@suse.cz> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/tty/serial/ioc3_serial.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c +index abd7ea26ed9a..27b5fefac171 100644 +--- a/drivers/tty/serial/ioc3_serial.c ++++ b/drivers/tty/serial/ioc3_serial.c +@@ -2137,7 +2137,8 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd) + + /* register port with the serial core */ + +- if ((ret = ioc3_serial_core_attach(is, idd))) ++ ret = ioc3_serial_core_attach(is, idd); ++ if (ret) + goto out4; + + Num_of_ioc3_cards++; +-- +2.3.7 + diff --git a/0009-ioc4_serial.c-move-assignment-out-of-if-block.patch b/0009-ioc4_serial.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..c763ecd6d1cbb6 --- /dev/null +++ b/0009-ioc4_serial.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,49 @@ +From e5e6f43422bf355ced0e328b7073f68bdb6b37cf 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 09/36] ioc4_serial.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: Pat Gefre <pfg@sgi.com> +CC: Jiri Slaby <jslaby@suse.cz> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/tty/serial/ioc4_serial.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c +index aa28209f44c1..e5c42fef69d2 100644 +--- a/drivers/tty/serial/ioc4_serial.c ++++ b/drivers/tty/serial/ioc4_serial.c +@@ -1011,7 +1011,8 @@ static irqreturn_t ioc4_intr(int irq, void *arg) + */ + for (xx = 0; xx < num_intrs; xx++) { + intr_info = &soft->is_intr_type[intr_type].is_intr_info[xx]; +- if ((this_mir = this_ir & intr_info->sd_bits)) { ++ this_mir = this_ir & intr_info->sd_bits; ++ if (this_mir) { + /* Disable owned interrupts, call handler */ + handled++; + write_ireg(soft, intr_info->sd_bits, IOC4_W_IEC, +@@ -2865,10 +2866,12 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd) + + /* register port with the serial core - 1 rs232, 1 rs422 */ + +- if ((ret = ioc4_serial_core_attach(idd->idd_pdev, PROTO_RS232))) ++ ret = ioc4_serial_core_attach(idd->idd_pdev, PROTO_RS232); ++ if (ret) + goto out4; + +- if ((ret = ioc4_serial_core_attach(idd->idd_pdev, PROTO_RS422))) ++ ret = ioc4_serial_core_attach(idd->idd_pdev, PROTO_RS422); ++ if (ret) + goto out5; + + Num_of_ioc4_cards++; +-- +2.3.7 + diff --git a/0010-mpsc.c-move-assignment-out-of-if-block.patch b/0010-mpsc.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..f4e60617a9ef8a --- /dev/null +++ b/0010-mpsc.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,80 @@ +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] 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 + diff --git a/0011-synclink.c-move-assignment-out-of-if-block.patch b/0011-synclink.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..e0fef214561fb6 --- /dev/null +++ b/0011-synclink.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,73 @@ +From cc9562d7ce941cb6517f4fd8e93ae9e165887958 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:08 +0200 +Subject: [PATCH 11/36] synclink.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/synclink.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c +index b7991707ffc0..2fac7123b274 100644 +--- a/drivers/tty/synclink.c ++++ b/drivers/tty/synclink.c +@@ -4410,7 +4410,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); +@@ -7751,7 +7752,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 +8020,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 +8042,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 +8079,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; + } +-- +2.3.7 + diff --git a/0012-synclink_gt.c-move-assignment-out-of-if-block.patch b/0012-synclink_gt.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..59aee2c9eb13fd --- /dev/null +++ b/0012-synclink_gt.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,73 @@ +From 1989ebb4bdb26b1c90a74fd64c7407222e8e2fee Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:08 +0200 +Subject: [PATCH 12/36] 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/tty/synclink_gt.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c +index 0e8c39b6ccd4..0ea8eee00178 100644 +--- a/drivers/tty/synclink_gt.c ++++ b/drivers/tty/synclink_gt.c +@@ -1539,7 +1539,8 @@ static int hdlcdev_open(struct net_device *dev) + DBGINFO(("%s hdlcdev_open\n", 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 */ +@@ -1803,7 +1804,8 @@ static int hdlcdev_init(struct slgt_info *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 alloc failure\n", info->device_name); + return -ENOMEM; + } +@@ -1824,7 +1826,8 @@ static int hdlcdev_init(struct slgt_info *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; +@@ -1879,7 +1882,8 @@ static void rx_async(struct slgt_info *info) + + stat = 0; + +- if ((status = *(p+1) & (BIT1 + BIT0))) { ++ status = *(p + 1) & (BIT1 + BIT0); ++ if (status) { + if (status & BIT1) + icount->parity++; + else if (status & BIT0) +@@ -3755,7 +3759,8 @@ static void slgt_cleanup(void) + if (serial_driver) { + for (info=slgt_device_list ; info != NULL ; info=info->next_device) + 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)); + put_tty_driver(serial_driver); + } +-- +2.3.7 + diff --git a/0013-synclinkmp.c-move-assignment-out-of-if-block.patch b/0013-synclinkmp.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..2eec77bcdaffc2 --- /dev/null +++ b/0013-synclinkmp.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,63 @@ +From 81823a3d3e8062b6556db720bac0d3ab15b5b81e Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:08 +0200 +Subject: [PATCH 13/36] synclinkmp.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/synclinkmp.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c +index c3f90910fed9..08633a8139ff 100644 +--- a/drivers/tty/synclinkmp.c ++++ b/drivers/tty/synclinkmp.c +@@ -1655,7 +1655,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 */ +@@ -1922,7 +1923,8 @@ static int hdlcdev_init(SLMP_INFO *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; + } +@@ -1943,7 +1945,8 @@ static int hdlcdev_init(SLMP_INFO *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; +@@ -3920,7 +3923,8 @@ static void synclinkmp_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); +-- +2.3.7 + diff --git a/0014-tty_buffer.c-move-assignment-out-of-if-block.patch b/0014-tty_buffer.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..18ee77fa038c3d --- /dev/null +++ b/0014-tty_buffer.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From dcf24946ecbcdc07ef7fe3cdd2d7c8bde0dc7ee4 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:09 +0200 +Subject: [PATCH 14/36] tty_buffer.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/tty_buffer.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c +index 75661641f5fe..5b2b0ffdde28 100644 +--- a/drivers/tty/tty_buffer.c ++++ b/drivers/tty/tty_buffer.c +@@ -262,7 +262,8 @@ static int __tty_buffer_request_room(struct tty_port *port, size_t size, + change = (b->flags & TTYB_NORMAL) && (~flags & TTYB_NORMAL); + if (change || left < size) { + /* This is the slow path - looking for new buffers to use */ +- if ((n = tty_buffer_alloc(port, size)) != NULL) { ++ n = tty_buffer_alloc(port, size); ++ if (n != NULL) { + n->flags = flags; + buf->tail = n; + b->commit = b->used; +-- +2.3.7 + diff --git a/0015-tty_ldsem.c-move-assignment-out-of-if-block.patch b/0015-tty_ldsem.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..680bc131fd7269 --- /dev/null +++ b/0015-tty_ldsem.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From d87ee8fe3fa67484312b43aed924a469611e39a4 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:09 +0200 +Subject: [PATCH 15/36] tty_ldsem.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/tty_ldsem.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/tty_ldsem.c b/drivers/tty/tty_ldsem.c +index 0ffb0cbe2823..ad7eba5ca380 100644 +--- a/drivers/tty/tty_ldsem.c ++++ b/drivers/tty/tty_ldsem.c +@@ -299,7 +299,8 @@ down_write_failed(struct ld_semaphore *sem, long count, long timeout) + timeout = schedule_timeout(timeout); + raw_spin_lock_irq(&sem->wait_lock); + set_task_state(tsk, TASK_UNINTERRUPTIBLE); +- if ((locked = writer_trylock(sem))) ++ locked = writer_trylock(sem); ++ if (locked) + break; + } + +-- +2.3.7 + diff --git a/0016-consolemap.c-move-assignment-out-of-if-block.patch b/0016-consolemap.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..fe46005f72d102 --- /dev/null +++ b/0016-consolemap.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,144 @@ +From 63b51628e8140adabb1a3d4ece779f2a432ab948 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:12 +0200 +Subject: [PATCH 16/36] consolemap.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> +CC: Takashi Iwai <tiwai@suse.de> +CC: Imre Deak <imre.deak@intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/tty/vt/consolemap.c | 60 ++++++++++++++++++++++++++++----------------- + 1 file changed, 37 insertions(+), 23 deletions(-) + +diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c +index 59b25e039968..c8c91f0476a2 100644 +--- a/drivers/tty/vt/consolemap.c ++++ b/drivers/tty/vt/consolemap.c +@@ -261,19 +261,22 @@ u16 inverse_translate(struct vc_data *conp, int glyph, int use_unicode) + int m; + if (glyph < 0 || glyph >= MAX_GLYPH) + return 0; +- else if (!(p = *conp->vc_uni_pagedir_loc)) +- return glyph; +- else if (use_unicode) { +- if (!p->inverse_trans_unicode) ++ else { ++ p = *conp->vc_uni_pagedir_loc; ++ if (!p) + return glyph; +- else +- return p->inverse_trans_unicode[glyph]; +- } else { +- m = inv_translate[conp->vc_num]; +- if (!p->inverse_translations[m]) +- return glyph; +- else +- return p->inverse_translations[m][glyph]; ++ else if (use_unicode) { ++ if (!p->inverse_trans_unicode) ++ return glyph; ++ else ++ return p->inverse_trans_unicode[glyph]; ++ } else { ++ m = inv_translate[conp->vc_num]; ++ if (!p->inverse_translations[m]) ++ return glyph; ++ else ++ return p->inverse_translations[m][glyph]; ++ } + } + } + EXPORT_SYMBOL_GPL(inverse_translate); +@@ -397,7 +400,8 @@ static void con_release_unimap(struct uni_pagedir *p) + + if (p == dflt) dflt = NULL; + for (i = 0; i < 32; i++) { +- if ((p1 = p->uni_pgdir[i]) != NULL) { ++ p1 = p->uni_pgdir[i]; ++ if (p1 != NULL) { + for (j = 0; j < 32; j++) + kfree(p1[j]); + kfree(p1); +@@ -473,14 +477,16 @@ con_insert_unipair(struct uni_pagedir *p, u_short unicode, u_short fontpos) + int i, n; + u16 **p1, *p2; + +- if (!(p1 = p->uni_pgdir[n = unicode >> 11])) { ++ p1 = p->uni_pgdir[n = unicode >> 11]; ++ if (!p1) { + p1 = p->uni_pgdir[n] = kmalloc(32*sizeof(u16 *), GFP_KERNEL); + if (!p1) return -ENOMEM; + for (i = 0; i < 32; i++) + p1[i] = NULL; + } + +- if (!(p2 = p1[n = (unicode >> 6) & 0x1f])) { ++ p2 = p1[n = (unicode >> 6) & 0x1f]; ++ if (!p2) { + p2 = p1[n] = kmalloc(64*sizeof(u16), GFP_KERNEL); + if (!p2) return -ENOMEM; + memset(p2, 0xff, 64*sizeof(u16)); /* No glyphs for the characters (yet) */ +@@ -569,10 +575,12 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list) + * entries from "p" (old) to "q" (new). + */ + l = 0; /* unicode value */ +- for (i = 0; i < 32; i++) +- if ((p1 = p->uni_pgdir[i])) +- for (j = 0; j < 32; j++) +- if ((p2 = p1[j])) { ++ for (i = 0; i < 32; i++) { ++ p1 = p->uni_pgdir[i]; ++ if (p1) ++ for (j = 0; j < 32; j++) { ++ p2 = p1[j]; ++ if (p2) { + for (k = 0; k < 64; k++, l++) + if (p2[k] != 0xffff) { + /* +@@ -593,9 +601,11 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list) + /* Account for row of 64 empty entries */ + l += 64; + } ++ } + else + /* Account for empty table */ + l += 32 * 64; ++ } + + /* + * Finished copying font table, set vc_uni_pagedir to new table +@@ -735,10 +745,12 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uni + ect = 0; + if (*vc->vc_uni_pagedir_loc) { + p = *vc->vc_uni_pagedir_loc; +- for (i = 0; i < 32; i++) +- if ((p1 = p->uni_pgdir[i])) +- for (j = 0; j < 32; j++) +- if ((p2 = *(p1++))) ++ for (i = 0; i < 32; i++) { ++ p1 = p->uni_pgdir[i]; ++ if (p1) ++ for (j = 0; j < 32; j++) { ++ p2 = *(p1++); ++ if (p2) + for (k = 0; k < 64; k++) { + if (*p2 < MAX_GLYPH && ect++ < ct) { + __put_user((u_short)((i<<11)+(j<<6)+k), +@@ -749,6 +761,8 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uni + } + p2++; + } ++ } ++ } + } + __put_user(ect, uct); + console_unlock(); +-- +2.3.7 + diff --git a/0017-speedtch.c-move-assignment-out-of-if-block.patch b/0017-speedtch.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..1033e4a2bb4d0f --- /dev/null +++ b/0017-speedtch.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,79 @@ +From 621ba9de84b27122635c9198b8db5c7b87dd811f Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:12 +0200 +Subject: [PATCH 17/36] speedtch.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: Duncan Sands <duncan.sands@free.fr> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/atm/speedtch.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c +index 0dc8c06a7b5f..0270d1312f83 100644 +--- a/drivers/usb/atm/speedtch.c ++++ b/drivers/usb/atm/speedtch.c +@@ -255,7 +255,8 @@ static int speedtch_upload_firmware(struct speedtch_instance_data *instance, + + usb_dbg(usbatm, "%s entered\n", __func__); + +- if (!(buffer = (unsigned char *)__get_free_page(GFP_KERNEL))) { ++ buffer = (unsigned char *)__get_free_page(GFP_KERNEL); ++ if (!buffer) { + ret = -ENOMEM; + usb_dbg(usbatm, "%s: no memory for buffer!\n", __func__); + goto out; +@@ -638,7 +639,8 @@ static void speedtch_handle_int(struct urb *int_urb) + goto fail; + } + +- if ((int_urb = instance->int_urb)) { ++ int_urb = instance->int_urb; ++ if (int_urb) { + ret = usb_submit_urb(int_urb, GFP_ATOMIC); + schedule_work(&instance->status_check_work); + if (ret < 0) { +@@ -650,7 +652,8 @@ static void speedtch_handle_int(struct urb *int_urb) + return; + + fail: +- if ((int_urb = instance->int_urb)) ++ int_urb = instance->int_urb; ++ if (int_urb) + mod_timer(&instance->resubmit_timer, jiffies + msecs_to_jiffies(RESUBMIT_DELAY)); + } + +@@ -759,11 +762,13 @@ static void speedtch_release_interfaces(struct usb_device *usb_dev, + struct usb_interface *cur_intf; + int i; + +- for (i = 0; i < num_interfaces; i++) +- if ((cur_intf = usb_ifnum_to_if(usb_dev, i))) { ++ for (i = 0; i < num_interfaces; i++) { ++ cur_intf = usb_ifnum_to_if(usb_dev, i); ++ if (cur_intf) { + usb_set_intfdata(cur_intf, NULL); + usb_driver_release_interface(&speedtch_usb_driver, cur_intf); + } ++ } + } + + static int speedtch_bind(struct usbatm_data *usbatm, +@@ -787,7 +792,8 @@ static int speedtch_bind(struct usbatm_data *usbatm, + return -ENODEV; + } + +- if (!(data_intf = usb_ifnum_to_if(usb_dev, INTERFACE_DATA))) { ++ data_intf = usb_ifnum_to_if(usb_dev, INTERFACE_DATA); ++ if (!data_intf) { + usb_err(usbatm, "%s: data interface not found!\n", __func__); + return -ENODEV; + } +-- +2.3.7 + diff --git a/0018-usbatm.c-move-assignment-out-of-if-block.patch b/0018-usbatm.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..3c69e9173df15f --- /dev/null +++ b/0018-usbatm.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,43 @@ +From d920ae9726cfa2552f91845e7acd5b97797d7bed Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:12 +0200 +Subject: [PATCH 18/36] usbatm.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: Duncan Sands <duncan.sands@free.fr> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/atm/usbatm.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c +index dada0146cd7f..db322d9ccb6e 100644 +--- a/drivers/usb/atm/usbatm.c ++++ b/drivers/usb/atm/usbatm.c +@@ -382,7 +382,8 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char + "%s: got packet (length: %u, pdu_length: %u, vcc: 0x%p)", + __func__, length, pdu_length, vcc); + +- if (!(skb = dev_alloc_skb(length))) { ++ skb = dev_alloc_skb(length); ++ if (!skb) { + if (printk_ratelimit()) + atm_err(instance, "%s: no memory for skb (length: %u)!\n", + __func__, length); +@@ -816,7 +817,8 @@ static int usbatm_atm_open(struct atm_vcc *vcc) + goto fail; + } + +- if (!(new = kzalloc(sizeof(struct usbatm_vcc_data), GFP_KERNEL))) { ++ new = kzalloc(sizeof(struct usbatm_vcc_data), GFP_KERNEL); ++ if (!new) { + atm_err(instance, "%s: no memory for vcc_data!\n", __func__); + ret = -ENOMEM; + goto fail; +-- +2.3.7 + diff --git a/0019-xusbatm.c-move-assignment-out-of-if-block.patch b/0019-xusbatm.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..4ecda2c460218f --- /dev/null +++ b/0019-xusbatm.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,42 @@ +From c4f66c75001c1221c50f19532cbacba6c6ba640e Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:15 +0200 +Subject: [PATCH 19/36] xusbatm.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. + +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/atm/xusbatm.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c +index b3b1bb78b2ef..a87597f88a84 100644 +--- a/drivers/usb/atm/xusbatm.c ++++ b/drivers/usb/atm/xusbatm.c +@@ -73,7 +73,8 @@ static int xusbatm_capture_intf(struct usbatm_data *usbatm, struct usb_device *u + usb_err(usbatm, "%s: failed to claim interface %2d (%d)!\n", __func__, ifnum, ret); + return ret; + } +- if ((ret = usb_set_interface(usb_dev, ifnum, altsetting))) { ++ ret = usb_set_interface(usb_dev, ifnum, altsetting); ++ if (ret) { + usb_err(usbatm, "%s: altsetting %2d for interface %2d failed (%d)!\n", __func__, altsetting, ifnum, ret); + return ret; + } +@@ -128,7 +129,8 @@ static int xusbatm_bind(struct usbatm_data *usbatm, + rx_intf->altsetting->desc.bInterfaceNumber, + tx_intf->altsetting->desc.bInterfaceNumber); + +- if ((ret = xusbatm_capture_intf(usbatm, usb_dev, rx_intf, rx_alt, rx_intf != intf))) ++ ret = xusbatm_capture_intf(usbatm, usb_dev, rx_intf, rx_alt, rx_intf != intf); ++ if (ret) + return ret; + + if ((tx_intf != rx_intf) && (ret = xusbatm_capture_intf(usbatm, usb_dev, tx_intf, tx_alt, tx_intf != intf))) { +-- +2.3.7 + diff --git a/0020-usblp.c-move-assignment-out-of-if-block.patch b/0020-usblp.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..4ef4c0b35483a9 --- /dev/null +++ b/0020-usblp.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,67 @@ +From de1affd1e2fd57f99f168e2d100bb16456b93a51 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:15 +0200 +Subject: [PATCH 20/36] usblp.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: Pete Zaitcev <zaitcev@redhat.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/class/usblp.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c +index 0924ee40a966..f38e875a3fb1 100644 +--- a/drivers/usb/class/usblp.c ++++ b/drivers/usb/class/usblp.c +@@ -660,7 +660,8 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) + switch (cmd) { + + case LPGETSTATUS: +- if ((retval = usblp_read_status(usblp, usblp->statusbuf))) { ++ retval = usblp_read_status(usblp, usblp->statusbuf); ++ if (retval) { + printk_ratelimited(KERN_ERR "usblp%d:" + "failed reading printer status (%d)\n", + usblp->minor, retval); +@@ -693,9 +694,11 @@ static struct urb *usblp_new_writeurb(struct usblp *usblp, int transfer_length) + struct urb *urb; + char *writebuf; + +- if ((writebuf = kmalloc(transfer_length, GFP_KERNEL)) == NULL) ++ writebuf = kmalloc(transfer_length, GFP_KERNEL); ++ if (writebuf == NULL) + return NULL; +- if ((urb = usb_alloc_urb(0, GFP_KERNEL)) == NULL) { ++ urb = usb_alloc_urb(0, GFP_KERNEL); ++ if (urb == NULL) { + kfree(writebuf); + return NULL; + } +@@ -732,7 +735,8 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t + transfer_length = USBLP_BUF_SIZE; + + rv = -ENOMEM; +- if ((writeurb = usblp_new_writeurb(usblp, transfer_length)) == NULL) ++ writeurb = usblp_new_writeurb(usblp, transfer_length); ++ if (writeurb == NULL) + goto raise_urb; + usb_anchor_urb(writeurb, &usblp->urbs); + +@@ -980,7 +984,8 @@ static int usblp_submit_read(struct usblp *usblp) + int rc; + + rc = -ENOMEM; +- if ((urb = usb_alloc_urb(0, GFP_KERNEL)) == NULL) ++ urb = usb_alloc_urb(0, GFP_KERNEL); ++ if (urb == NULL) + goto raise_urb; + + usb_fill_bulk_urb(urb, usblp->dev, +-- +2.3.7 + diff --git a/0021-devio.c-move-assignment-out-of-if-block.patch b/0021-devio.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..d9d1da450e2e60 --- /dev/null +++ b/0021-devio.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,122 @@ +From cce8f17bc680374f46397985858b612327a92f12 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:17 +0200 +Subject: [PATCH 21/36] devio.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: Alan Stern <stern@rowland.harvard.edu> +CC: Chase Metzger <chasemetzger15@gmail.com> +CC: Hans de Goede <hdegoede@redhat.com> +CC: Oliver Neukum <oneukum@suse.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/core/devio.c | 60 ++++++++++++++++++++++++++---------------------- + 1 file changed, 33 insertions(+), 27 deletions(-) + +diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c +index 4b0448c26810..584f3eaa1862 100644 +--- a/drivers/usb/core/devio.c ++++ b/drivers/usb/core/devio.c +@@ -1082,7 +1082,8 @@ static int proc_bulk(struct usb_dev_state *ps, void __user *arg) + ret = usbfs_increase_memory_usage(len1 + sizeof(struct urb)); + if (ret) + return ret; +- if (!(tbuf = kmalloc(len1, GFP_KERNEL))) { ++ tbuf = kmalloc(len1, GFP_KERNEL); ++ if (!tbuf) { + ret = -ENOMEM; + goto done; + } +@@ -1224,7 +1225,8 @@ static int proc_setintf(struct usb_dev_state *ps, void __user *arg) + + if (copy_from_user(&setintf, arg, sizeof(setintf))) + return -EFAULT; +- if ((ret = checkintf(ps, setintf.interface))) ++ ret = checkintf(ps, setintf.interface); ++ if (ret) + return ret; + + destroy_async_on_interface(ps, setintf.interface); +@@ -1393,7 +1395,8 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb + number_of_packets = uurb->number_of_packets; + isofrmlen = sizeof(struct usbdevfs_iso_packet_desc) * + number_of_packets; +- if (!(isopkt = kmalloc(isofrmlen, GFP_KERNEL))) ++ isopkt = kmalloc(isofrmlen, GFP_KERNEL); ++ if (!isopkt) + return -ENOMEM; + if (copy_from_user(isopkt, iso_frame_desc, isofrmlen)) { + ret = -EFAULT; +@@ -1940,38 +1943,41 @@ static int proc_ioctl(struct usb_dev_state *ps, struct usbdevfs_ioctl *ctl) + + if (ps->dev->state != USB_STATE_CONFIGURED) + retval = -EHOSTUNREACH; +- else if (!(intf = usb_ifnum_to_if(ps->dev, ctl->ifno))) +- retval = -EINVAL; +- else switch (ctl->ioctl_code) { ++ else { ++ intf = usb_ifnum_to_if(ps->dev, ctl->ifno); ++ if (!intf) ++ retval = -EINVAL; ++ else switch (ctl->ioctl_code) { + + /* disconnect kernel driver from interface */ +- case USBDEVFS_DISCONNECT: +- if (intf->dev.driver) { +- driver = to_usb_driver(intf->dev.driver); +- dev_dbg(&intf->dev, "disconnect by usbfs\n"); +- usb_driver_release_interface(driver, intf); +- } else +- retval = -ENODATA; +- break; ++ case USBDEVFS_DISCONNECT: ++ if (intf->dev.driver) { ++ driver = to_usb_driver(intf->dev.driver); ++ dev_dbg(&intf->dev, "disconnect by usbfs\n"); ++ usb_driver_release_interface(driver, intf); ++ } else ++ retval = -ENODATA; ++ break; + + /* let kernel drivers try to (re)bind to the interface */ +- case USBDEVFS_CONNECT: +- if (!intf->dev.driver) +- retval = device_attach(&intf->dev); +- else +- retval = -EBUSY; +- break; ++ case USBDEVFS_CONNECT: ++ if (!intf->dev.driver) ++ retval = device_attach(&intf->dev); ++ else ++ retval = -EBUSY; ++ break; + + /* talk directly to the interface's driver */ + default: +- if (intf->dev.driver) +- driver = to_usb_driver(intf->dev.driver); +- if (driver == NULL || driver->unlocked_ioctl == NULL) { +- retval = -ENOTTY; +- } else { +- retval = driver->unlocked_ioctl(intf, ctl->ioctl_code, buf); +- if (retval == -ENOIOCTLCMD) ++ if (intf->dev.driver) ++ driver = to_usb_driver(intf->dev.driver); ++ if (driver == NULL || driver->unlocked_ioctl == NULL) { + retval = -ENOTTY; ++ } else { ++ retval = driver->unlocked_ioctl(intf, ctl->ioctl_code, buf); ++ if (retval == -ENOIOCTLCMD) ++ retval = -ENOTTY; ++ } + } + } + +-- +2.3.7 + diff --git a/0022-hcd.c-move-assignment-out-of-if-block.patch b/0022-hcd.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..510db88acb8354 --- /dev/null +++ b/0022-hcd.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,40 @@ +From 05b4a29d4ff1bef8aaaa42acbccb2ed22e400432 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:20 +0200 +Subject: [PATCH 22/36] hcd.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: Alan Stern <stern@rowland.harvard.edu> +CC: Felipe Balbi <balbi@ti.com> +CC: Dan Williams <dan.j.williams@intel.com> +CC: Antoine Tenart <antoine.tenart@free-electrons.com> +CC: Petr Mladek <pmladek@suse.cz> +CC: Michal Sojka <sojka@merica.cz> +CC: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> +CC: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/core/hcd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c +index 45a915ccd71c..be5b2074f906 100644 +--- a/drivers/usb/core/hcd.c ++++ b/drivers/usb/core/hcd.c +@@ -2691,7 +2691,8 @@ int usb_add_hcd(struct usb_hcd *hcd, + if ((retval = usb_register_bus(&hcd->self)) < 0) + goto err_register_bus; + +- if ((rhdev = usb_alloc_dev(NULL, &hcd->self, 0)) == NULL) { ++ rhdev = usb_alloc_dev(NULL, &hcd->self, 0); ++ if (rhdev == NULL) { + dev_err(hcd->self.controller, "unable to allocate root hub\n"); + retval = -ENOMEM; + goto err_allocate_root_hub; +-- +2.3.7 + diff --git a/0023-hub.c-move-assignment-out-of-if-block.patch b/0023-hub.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..85a0ee4b9d6a95 --- /dev/null +++ b/0023-hub.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,36 @@ +From ef578ef0909f074287986f865173be92d7028213 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:22 +0200 +Subject: [PATCH 23/36] hub.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: Alan Stern <stern@rowland.harvard.edu> +CC: Dan Williams <dan.j.williams@intel.com> +CC: Petr Mladek <pmladek@suse.cz> +CC: Peter Chen <peter.chen@freescale.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/core/hub.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c +index 3b7151687776..329073c8ede2 100644 +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -795,7 +795,8 @@ int usb_hub_clear_tt_buffer(struct urb *urb) + * since each TT has "at least two" buffers that can need it (and + * there can be many TTs per hub). even if they're uncommon. + */ +- if ((clear = kmalloc (sizeof *clear, GFP_ATOMIC)) == NULL) { ++ clear = kmalloc(sizeof *clear, GFP_ATOMIC); ++ if (clear == NULL) { + dev_err (&udev->dev, "can't save CLEAR_TT_BUFFER state\n"); + /* FIXME recover somehow ... RESET_TT? */ + return -ENOMEM; +-- +2.3.7 + diff --git a/0024-inode.c-move-assignment-out-of-if-block.patch b/0024-inode.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..772c326ca30977 --- /dev/null +++ b/0024-inode.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,45 @@ +From d6c11e0e4a89f6c5e5b941cd170c3166d72b40e5 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:24 +0200 +Subject: [PATCH 24/36] inode.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: Felipe Balbi <balbi@ti.com> +CC: Al Viro <viro@zeniv.linux.org.uk> +CC: Christoph Hellwig <hch@lst.de> +CC: Peter Chen <peter.chen@freescale.com> +CC: Alan Stern <stern@rowland.harvard.edu> +CC: Andrzej Pietrasiewicz <andrzej.p@samsung.com> +CC: Paul Bolle <pebolle@tiscali.nl> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/gadget/legacy/inode.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c +index 2030565c6789..f454c7af489c 100644 +--- a/drivers/usb/gadget/legacy/inode.c ++++ b/drivers/usb/gadget/legacy/inode.c +@@ -769,9 +769,12 @@ ep_config (struct ep_data *data, const char *buf, size_t len) + if (data->dev->state == STATE_DEV_UNBOUND) { + value = -ENOENT; + goto gone; +- } else if ((ep = data->ep) == NULL) { +- value = -ENODEV; +- goto gone; ++ } else { ++ ep = data->ep; ++ if (ep == NULL) { ++ value = -ENODEV; ++ goto gone; ++ } + } + switch (data->dev->gadget->speed) { + case USB_SPEED_LOW: +-- +2.3.7 + diff --git a/0025-ehci-dbg.c-move-assignment-out-of-if-block.patch b/0025-ehci-dbg.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..20c14efbffb4d2 --- /dev/null +++ b/0025-ehci-dbg.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From 3737858648328276d4894d33d70adf81d4d8347d Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:25 +0200 +Subject: [PATCH 25/36] ehci-dbg.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: Alan Stern <stern@rowland.harvard.edu> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/host/ehci-dbg.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c +index 524cbf26d992..b26b96e25a13 100644 +--- a/drivers/usb/host/ehci-dbg.c ++++ b/drivers/usb/host/ehci-dbg.c +@@ -628,7 +628,8 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf) + unsigned i; + __hc32 tag; + +- if (!(seen = kmalloc (DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC))) ++ seen = kmalloc(DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC); ++ if (!seen) + return 0; + seen_count = 0; + +-- +2.3.7 + diff --git a/0026-fusbh200-hcd.c-move-assignment-out-of-if-block.patch b/0026-fusbh200-hcd.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..4110957407f711 --- /dev/null +++ b/0026-fusbh200-hcd.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,38 @@ +From 4e4b3ca0b5b8be99c6588e0291dc4bb14275bd88 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:27 +0200 +Subject: [PATCH 26/36] fusbh200-hcd.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: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> +CC: Alan Stern <stern@rowland.harvard.edu> +CC: Petr Mladek <pmladek@suse.cz> +CC: Randy Dunlap <rdunlap@infradead.org> +CC: Felipe Balbi <balbi@ti.com> +CC: Masanari Iida <standby24x7@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/host/fusbh200-hcd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/host/fusbh200-hcd.c b/drivers/usb/host/fusbh200-hcd.c +index 00e492eaba6a..1fd8718a9f11 100644 +--- a/drivers/usb/host/fusbh200-hcd.c ++++ b/drivers/usb/host/fusbh200-hcd.c +@@ -499,7 +499,8 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf) + unsigned i; + __hc32 tag; + +- if (!(seen = kmalloc (DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC))) ++ seen = kmalloc(DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC); ++ if (!seen) + return 0; + seen_count = 0; + +-- +2.3.7 + diff --git a/0027-isp116x-hcd.c-move-assignment-out-of-if-block.patch b/0027-isp116x-hcd.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..fa803daa0b39a4 --- /dev/null +++ b/0027-isp116x-hcd.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From fa1a7880be18b26b5cf545feabf444f1f4a1a929 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:27 +0200 +Subject: [PATCH 27/36] isp116x-hcd.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: Olav Kongas <ok@artecdesign.ee> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/host/isp116x-hcd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c +index 13181dcd9820..d089b3fb7a13 100644 +--- a/drivers/usb/host/isp116x-hcd.c ++++ b/drivers/usb/host/isp116x-hcd.c +@@ -500,7 +500,8 @@ static void start_atl_transfers(struct isp116x *isp116x) + if (isp116x->periodic_count) { + isp116x->fmindex = index = + (isp116x->fmindex + 1) & (PERIODIC_SIZE - 1); +- if ((load = isp116x->load[index])) { ++ load = isp116x->load[index]; ++ if (load) { + /* Bring all int transfers for this frame + into the active queue */ + isp116x->atl_active = last_ep = +-- +2.3.7 + diff --git a/0028-ohci-dbg.c-move-assignment-out-of-if-block.patch b/0028-ohci-dbg.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..a09f3443735277 --- /dev/null +++ b/0028-ohci-dbg.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,43 @@ +From 12ed2c821d231d5e83e9fdccbacfed4b2604994e Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:28 +0200 +Subject: [PATCH 28/36] ohci-dbg.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: Alan Stern <stern@rowland.harvard.edu> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/host/ohci-dbg.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c +index 04f2186939d2..c3eded317495 100644 +--- a/drivers/usb/host/ohci-dbg.c ++++ b/drivers/usb/host/ohci-dbg.c +@@ -491,7 +491,8 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf) + char *next; + unsigned i; + +- if (!(seen = kmalloc (DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC))) ++ seen = kmalloc(DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC); ++ if (!seen) + return 0; + seen_count = 0; + +@@ -506,7 +507,8 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf) + /* dump a snapshot of the periodic schedule (and load) */ + spin_lock_irqsave (&ohci->lock, flags); + for (i = 0; i < NUM_INTS; i++) { +- if (!(ed = ohci->periodic [i])) ++ ed = ohci->periodic[i]; ++ if (!ed) + continue; + + temp = scnprintf (next, size, "%2d [%3d]:", i, ohci->load [i]); +-- +2.3.7 + diff --git a/0029-ohci-hcd.c-move-assignment-out-of-if-block.patch b/0029-ohci-hcd.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..f346d478bd2110 --- /dev/null +++ b/0029-ohci-hcd.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From 9d89910bb254d2686d58aeaa91c818abdae25e52 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:28 +0200 +Subject: [PATCH 29/36] ohci-hcd.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: Alan Stern <stern@rowland.harvard.edu> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/host/ohci-hcd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c +index 1dab9dfbca6a..760cb57e954e 100644 +--- a/drivers/usb/host/ohci-hcd.c ++++ b/drivers/usb/host/ohci-hcd.c +@@ -155,7 +155,8 @@ static int ohci_urb_enqueue ( + int retval = 0; + + /* every endpoint has a ed, locate and maybe (re)initialize it */ +- if (! (ed = ed_get (ohci, urb->ep, urb->dev, pipe, urb->interval))) ++ ed = ed_get(ohci, urb->ep, urb->dev, pipe, urb->interval); ++ if (! ed) + return -ENOMEM; + + /* for the private part of the URB we need the number of TDs (size) */ +-- +2.3.7 + diff --git a/0030-ohci-q.c-move-assignment-out-of-if-block.patch b/0030-ohci-q.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..3177b4d3523c2f --- /dev/null +++ b/0030-ohci-q.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From 655a7aabfe2c282e713ded9bee60e38bf2cdc7e6 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:29 +0200 +Subject: [PATCH 30/36] ohci-q.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: Alan Stern <stern@rowland.harvard.edu> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/host/ohci-q.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c +index 1463c398d322..f7d561ed3c23 100644 +--- a/drivers/usb/host/ohci-q.c ++++ b/drivers/usb/host/ohci-q.c +@@ -407,7 +407,8 @@ static struct ed *ed_get ( + + spin_lock_irqsave (&ohci->lock, flags); + +- if (!(ed = ep->hcpriv)) { ++ ed = ep->hcpriv; ++ if (!ed) { + struct td *td; + int is_out; + u32 info; +-- +2.3.7 + diff --git a/0031-sisusb.c-move-assignment-out-of-if-block.patch b/0031-sisusb.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..7cf74f51a3b25a --- /dev/null +++ b/0031-sisusb.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,144 @@ +From 6e547c2240493813cc3bff47ab4b7e82ebf2548f Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:29 +0200 +Subject: [PATCH 31/36] sisusb.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: Thomas Winischhofer <thomas@winischhofer.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/misc/sisusbvga/sisusb.c | 39 ++++++++++++++++++++++++------------- + 1 file changed, 26 insertions(+), 13 deletions(-) + +diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c +index 022dc0008f2a..306d6852ebc7 100644 +--- a/drivers/usb/misc/sisusbvga/sisusb.c ++++ b/drivers/usb/misc/sisusbvga/sisusb.c +@@ -2316,10 +2316,12 @@ sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init) + /* Set mode 0x03 */ + SiSUSBSetMode(sisusb->SiS_Pr, 0x03); + +- if (!(myfont = find_font("VGA8x16"))) ++ myfont = find_font("VGA8x16"); ++ if (!myfont) + return 1; + +- if (!(tempbuf = vmalloc(8192))) ++ tempbuf = vmalloc(8192); ++ if (!tempbuf) + return 1; + + for (i = 0; i < 256; i++) +@@ -2342,7 +2344,8 @@ sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init) + + if (init && !sisusb->scrbuf) { + +- if ((tempbuf = vmalloc(8192))) { ++ tempbuf = vmalloc(8192); ++ if (tempbuf) { + + i = 4096; + tempbufb = (u16 *)tempbuf; +@@ -2417,11 +2420,13 @@ sisusb_open(struct inode *inode, struct file *file) + struct usb_interface *interface; + int subminor = iminor(inode); + +- if (!(interface = usb_find_interface(&sisusb_driver, subminor))) { ++ interface = usb_find_interface(&sisusb_driver, subminor); ++ if (!interface) { + return -ENODEV; + } + +- if (!(sisusb = usb_get_intfdata(interface))) { ++ sisusb = usb_get_intfdata(interface); ++ if (!sisusb) { + return -ENODEV; + } + +@@ -2488,7 +2493,8 @@ sisusb_release(struct inode *inode, struct file *file) + { + struct sisusb_usb_data *sisusb; + +- if (!(sisusb = file->private_data)) ++ sisusb = file->private_data; ++ if (!sisusb) + return -ENODEV; + + mutex_lock(&sisusb->lock); +@@ -2520,7 +2526,8 @@ sisusb_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos) + u16 buf16; + u32 buf32, address; + +- if (!(sisusb = file->private_data)) ++ sisusb = file->private_data; ++ if (!sisusb) + return -ENODEV; + + mutex_lock(&sisusb->lock); +@@ -2662,7 +2669,8 @@ sisusb_write(struct file *file, const char __user *buffer, size_t count, + u16 buf16; + u32 buf32, address; + +- if (!(sisusb = file->private_data)) ++ sisusb = file->private_data; ++ if (!sisusb) + return -ENODEV; + + mutex_lock(&sisusb->lock); +@@ -2805,7 +2813,8 @@ sisusb_lseek(struct file *file, loff_t offset, int orig) + struct sisusb_usb_data *sisusb; + loff_t ret; + +- if (!(sisusb = file->private_data)) ++ sisusb = file->private_data; ++ if (!sisusb) + return -ENODEV; + + mutex_lock(&sisusb->lock); +@@ -2970,7 +2979,8 @@ sisusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg) + long retval = 0; + u32 __user *argp = (u32 __user *)arg; + +- if (!(sisusb = file->private_data)) ++ sisusb = file->private_data; ++ if (!sisusb) + return -ENODEV; + + mutex_lock(&sisusb->lock); +@@ -3084,7 +3094,8 @@ static int sisusb_probe(struct usb_interface *intf, + dev->devnum); + + /* Allocate memory for our private */ +- if (!(sisusb = kzalloc(sizeof(*sisusb), GFP_KERNEL))) { ++ sisusb = kzalloc(sizeof(*sisusb), GFP_KERNEL); ++ if (!sisusb) { + dev_err(&dev->dev, "Failed to allocate memory for private data\n"); + return -ENOMEM; + } +@@ -3093,7 +3104,8 @@ static int sisusb_probe(struct usb_interface *intf, + mutex_init(&(sisusb->lock)); + + /* Register device */ +- if ((retval = usb_register_dev(intf, &usb_sisusb_class))) { ++ retval = usb_register_dev(intf, &usb_sisusb_class); ++ if (retval) { + dev_err(&sisusb->sisusb_dev->dev, "Failed to get a minor for device %d\n", + dev->devnum); + retval = -ENODEV; +@@ -3214,7 +3226,8 @@ static void sisusb_disconnect(struct usb_interface *intf) + struct sisusb_usb_data *sisusb; + + /* This should *not* happen */ +- if (!(sisusb = usb_get_intfdata(intf))) ++ sisusb = usb_get_intfdata(intf); ++ if (!sisusb) + return; + + #ifdef INCL_SISUSB_CON +-- +2.3.7 + diff --git a/0032-sisusb_con.c-move-assignment-out-of-if-block.patch b/0032-sisusb_con.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..89f9530c20afff --- /dev/null +++ b/0032-sisusb_con.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,203 @@ +From 55b8ab857bc6f4c2180264aa605a2eeb1296d359 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:30 +0200 +Subject: [PATCH 32/36] sisusb_con.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: Thomas Winischhofer <thomas@winischhofer.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/misc/sisusbvga/sisusb_con.c | 54 ++++++++++++++++++++++----------- + 1 file changed, 36 insertions(+), 18 deletions(-) + +diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c +index a638c4e9a947..ace343088915 100644 +--- a/drivers/usb/misc/sisusbvga/sisusb_con.c ++++ b/drivers/usb/misc/sisusbvga/sisusb_con.c +@@ -169,7 +169,8 @@ sisusb_get_sisusb_lock_and_check(unsigned short console) + if (in_atomic()) + return NULL; + +- if (!(sisusb = sisusb_get_sisusb(console))) ++ sisusb = sisusb_get_sisusb(console); ++ if (!sisusb) + return NULL; + + mutex_lock(&sisusb->lock); +@@ -214,7 +215,8 @@ sisusbcon_init(struct vc_data *c, int init) + * are set up/restored. + */ + +- if (!(sisusb = sisusb_get_sisusb(c->vc_num))) ++ sisusb = sisusb_get_sisusb(c->vc_num); ++ if (!sisusb) + return; + + mutex_lock(&sisusb->lock); +@@ -277,7 +279,8 @@ sisusbcon_deinit(struct vc_data *c) + * and others, ie not under our control. + */ + +- if (!(sisusb = sisusb_get_sisusb(c->vc_num))) ++ sisusb = sisusb_get_sisusb(c->vc_num); ++ if (!sisusb) + return; + + mutex_lock(&sisusb->lock); +@@ -369,7 +372,8 @@ sisusbcon_putc(struct vc_data *c, int ch, int y, int x) + struct sisusb_usb_data *sisusb; + ssize_t written; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return; + + /* sisusb->lock is down */ +@@ -395,7 +399,8 @@ sisusbcon_putcs(struct vc_data *c, const unsigned short *s, + u16 *dest; + int i; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return; + + /* sisusb->lock is down */ +@@ -433,7 +438,8 @@ sisusbcon_clear(struct vc_data *c, int y, int x, int height, int width) + if (width <= 0 || height <= 0) + return; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return; + + /* sisusb->lock is down */ +@@ -486,7 +492,8 @@ sisusbcon_bmove(struct vc_data *c, int sy, int sx, + if (width <= 0 || height <= 0) + return; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return; + + /* sisusb->lock is down */ +@@ -520,7 +527,8 @@ sisusbcon_switch(struct vc_data *c) + * Returnvalue != 0 naturally means the opposite. + */ + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return 0; + + /* sisusb->lock is down */ +@@ -569,7 +577,8 @@ sisusbcon_save_screen(struct vc_data *c) + * buffer. + */ + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return; + + /* sisusb->lock is down */ +@@ -602,7 +611,8 @@ sisusbcon_set_palette(struct vc_data *c, unsigned char *table) + if (!CON_IS_VISIBLE(c)) + return -EINVAL; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return -EINVAL; + + /* sisusb->lock is down */ +@@ -637,7 +647,8 @@ sisusbcon_blank(struct vc_data *c, int blank, int mode_switch) + ssize_t written; + int ret = 0; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return 0; + + /* sisusb->lock is down */ +@@ -721,7 +732,8 @@ sisusbcon_scrolldelta(struct vc_data *c, int lines) + + /* The return value does not seem to be used */ + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return 0; + + /* sisusb->lock is down */ +@@ -779,7 +791,8 @@ sisusbcon_cursor(struct vc_data *c, int mode) + struct sisusb_usb_data *sisusb; + int from, to, baseline; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return; + + /* sisusb->lock is down */ +@@ -906,7 +919,8 @@ sisusbcon_scroll(struct vc_data *c, int t, int b, int dir, int lines) + if (!lines) + return 1; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return 0; + + /* sisusb->lock is down */ +@@ -1018,7 +1032,8 @@ sisusbcon_set_origin(struct vc_data *c) + * screenbuffer as the origin. + */ + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return 0; + + /* sisusb->lock is down */ +@@ -1047,7 +1062,8 @@ sisusbcon_resize(struct vc_data *c, unsigned int newcols, unsigned int newrows, + struct sisusb_usb_data *sisusb; + int fh; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return -ENODEV; + + fh = sisusb->current_font_height; +@@ -1286,7 +1302,8 @@ sisusbcon_font_set(struct vc_data *c, struct console_font *font, + if (font->width != 8 || (charcount != 256 && charcount != 512)) + return -EINVAL; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return -ENODEV; + + /* sisusb->lock is down */ +@@ -1326,7 +1343,8 @@ sisusbcon_font_get(struct vc_data *c, struct console_font *font) + { + struct sisusb_usb_data *sisusb; + +- if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) ++ sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); ++ if (!sisusb) + return -ENODEV; + + /* sisusb->lock is down */ +-- +2.3.7 + diff --git a/0033-uss720.c-move-assignment-out-of-if-block.patch b/0033-uss720.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..9533cb0ab3a2ae --- /dev/null +++ b/0033-uss720.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,43 @@ +From eda9a7e388cbf13b7fbabeb7d903f3aae5523944 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:32 +0200 +Subject: [PATCH 33/36] uss720.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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/misc/uss720.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c +index 588d62a73e1a..bbd029c9c725 100644 +--- a/drivers/usb/misc/uss720.c ++++ b/drivers/usb/misc/uss720.c +@@ -714,7 +714,8 @@ static int uss720_probe(struct usb_interface *intf, + /* + * Allocate parport interface + */ +- if (!(priv = kzalloc(sizeof(struct parport_uss720_private), GFP_KERNEL))) { ++ priv = kzalloc(sizeof(struct parport_uss720_private), GFP_KERNEL); ++ if (!priv) { + usb_put_dev(usbdev); + return -ENOMEM; + } +@@ -723,7 +724,8 @@ static int uss720_probe(struct usb_interface *intf, + kref_init(&priv->ref_count); + spin_lock_init(&priv->asynclock); + INIT_LIST_HEAD(&priv->asynclist); +- if (!(pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &parport_uss720_ops))) { ++ pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &parport_uss720_ops); ++ if (!pp) { + printk(KERN_WARNING "uss720: could not register parport\n"); + goto probe_abort; + } +-- +2.3.7 + diff --git a/0034-mon_bin.c-move-assignment-out-of-if-block.patch b/0034-mon_bin.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..f3e83547d67b32 --- /dev/null +++ b/0034-mon_bin.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,43 @@ +From 5e6c9f9aecf7e9fc69394ebfeff4b7234bd2c9d5 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:34 +0200 +Subject: [PATCH 34/36] mon_bin.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. + +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/mon/mon_bin.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c +index 9a62e89d6dc0..3598f1a62673 100644 +--- a/drivers/usb/mon/mon_bin.c ++++ b/drivers/usb/mon/mon_bin.c +@@ -675,7 +675,8 @@ static int mon_bin_open(struct inode *inode, struct file *file) + int rc; + + mutex_lock(&mon_lock); +- if ((mbus = mon_bus_lookup(iminor(inode))) == NULL) { ++ mbus = mon_bus_lookup(iminor(inode)); ++ if (mbus == NULL) { + mutex_unlock(&mon_lock); + return -ENODEV; + } +@@ -1018,8 +1019,8 @@ static long mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg + return -EINVAL; + + size = CHUNK_ALIGN(arg); +- if ((vec = kzalloc(sizeof(struct mon_pgmap) * (size/CHUNK_SIZE), +- GFP_KERNEL)) == NULL) { ++ vec = kzalloc(sizeof(struct mon_pgmap) * (size / CHUNK_SIZE), GFP_KERNEL); ++ if (vec == NULL) { + ret = -ENOMEM; + break; + } +-- +2.3.7 + diff --git a/0035-mon_main.c-move-assignment-out-of-if-block.patch b/0035-mon_main.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..72f9f96318193f --- /dev/null +++ b/0035-mon_main.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,62 @@ +From ed1aa46db7d2fa1b00838fac9ba71e85d22b0931 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:36 +0200 +Subject: [PATCH 35/36] mon_main.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. + +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/mon/mon_main.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c +index 10405119985c..f7c292f4891e 100644 +--- a/drivers/usb/mon/mon_main.c ++++ b/drivers/usb/mon/mon_main.c +@@ -96,7 +96,8 @@ static void mon_submit(struct usb_bus *ubus, struct urb *urb) + { + struct mon_bus *mbus; + +- if ((mbus = ubus->mon_bus) != NULL) ++ mbus = ubus->mon_bus; ++ if (mbus != NULL) + mon_bus_submit(mbus, urb); + mon_bus_submit(&mon_bus0, urb); + } +@@ -122,7 +123,8 @@ static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error) + { + struct mon_bus *mbus; + +- if ((mbus = ubus->mon_bus) != NULL) ++ mbus = ubus->mon_bus; ++ if (mbus != NULL) + mon_bus_submit_error(mbus, urb, error); + mon_bus_submit_error(&mon_bus0, urb, error); + } +@@ -148,7 +150,8 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb, int status) + { + struct mon_bus *mbus; + +- if ((mbus = ubus->mon_bus) != NULL) ++ mbus = ubus->mon_bus; ++ if (mbus != NULL) + mon_bus_complete(mbus, urb, status); + mon_bus_complete(&mon_bus0, urb, status); + } +@@ -280,7 +283,8 @@ static void mon_bus_init(struct usb_bus *ubus) + { + struct mon_bus *mbus; + +- if ((mbus = kzalloc(sizeof(struct mon_bus), GFP_KERNEL)) == NULL) ++ mbus = kzalloc(sizeof(struct mon_bus), GFP_KERNEL); ++ if (mbus == NULL) + goto err_alloc; + kref_init(&mbus->ref); + spin_lock_init(&mbus->lock); +-- +2.3.7 + diff --git a/0036-mon_stat.c-move-assignment-out-of-if-block.patch b/0036-mon_stat.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..c831e083acde08 --- /dev/null +++ b/0036-mon_stat.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,32 @@ +From 912396218c26521b94c90db5ef54ee1ebb829a42 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:38 +0200 +Subject: [PATCH 36/36] mon_stat.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. + +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/mon/mon_stat.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c +index ebd6189a5014..5388a339cfb8 100644 +--- a/drivers/usb/mon/mon_stat.c ++++ b/drivers/usb/mon/mon_stat.c +@@ -28,7 +28,8 @@ static int mon_stat_open(struct inode *inode, struct file *file) + struct mon_bus *mbus; + struct snap *sp; + +- if ((sp = kmalloc(sizeof(struct snap), GFP_KERNEL)) == NULL) ++ sp = kmalloc(sizeof(struct snap), GFP_KERNEL); ++ if (sp == NULL) + return -ENOMEM; + + mbus = inode->i_private; +-- +2.3.7 + diff --git a/csdio2.patch b/csdio2.patch index 19a1b9407ba921..af44611e9d5b84 100644 --- a/csdio2.patch +++ b/csdio2.patch @@ -240,7 +240,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> +connected to different SDIO hosts. --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig -@@ -602,5 +602,28 @@ config TILE_SROM +@@ -611,5 +611,28 @@ config TILE_SROM source "drivers/char/xillybus/Kconfig" @@ -1391,7 +1391,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> +#endif --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild -@@ -89,6 +89,7 @@ header-y += coff.h +@@ -91,6 +91,7 @@ header-y += coff.h header-y += connector.h header-y += const.h header-y += cramfs_fs.h diff --git a/driver-core-remove-struct-bus_type.dev_attrs.patch b/driver-core-remove-struct-bus_type.dev_attrs.patch index d86ed6c71a195e..d18ed3078848c5 100644 --- a/driver-core-remove-struct-bus_type.dev_attrs.patch +++ b/driver-core-remove-struct-bus_type.dev_attrs.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/base/bus.c +++ b/drivers/base/bus.c -@@ -464,35 +464,6 @@ int bus_for_each_drv(struct bus_type *bu +@@ -466,35 +466,6 @@ int bus_for_each_drv(struct bus_type *bu } EXPORT_SYMBOL_GPL(bus_for_each_drv); @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /** * bus_add_device - add device to bus * @dev: device being added -@@ -508,16 +479,13 @@ int bus_add_device(struct device *dev) +@@ -510,16 +481,13 @@ int bus_add_device(struct device *dev) if (bus) { pr_debug("bus: '%s': add device %s\n", bus->name, dev_name(dev)); @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> error = sysfs_create_link(&dev->kobj, &dev->bus->p->subsys.kobj, "subsystem"); if (error) -@@ -530,8 +498,6 @@ out_subsys: +@@ -532,8 +500,6 @@ out_subsys: sysfs_remove_link(&bus->p->devices_kset->kobj, dev_name(dev)); out_groups: device_remove_groups(dev, bus->dev_groups); @@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> out_put: bus_put(dev->bus); return error; -@@ -591,7 +557,6 @@ void bus_remove_device(struct device *de +@@ -593,7 +559,6 @@ void bus_remove_device(struct device *de sysfs_remove_link(&dev->kobj, "subsystem"); sysfs_remove_link(&dev->bus->p->devices_kset->kobj, dev_name(dev)); diff --git a/p19.patch b/p19.patch index 51c192b5195972..0b318722de08f4 100644 --- a/p19.patch +++ b/p19.patch @@ -4,7 +4,7 @@ --- a/arch/mips/sgi-ip22/ip22-gio.c +++ b/arch/mips/sgi-ip22/ip22-gio.c -@@ -191,6 +191,7 @@ static ssize_t modalias_show(struct devi +@@ -169,6 +169,7 @@ static ssize_t modalias_show(struct devi return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; } @@ -12,7 +12,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, char *buf) -@@ -200,6 +201,7 @@ static ssize_t name_show(struct device * +@@ -178,6 +179,7 @@ static ssize_t name_show(struct device * giodev = to_gio_device(dev); return sprintf(buf, "%s", giodev->name); } @@ -20,7 +20,7 @@ static ssize_t id_show(struct device *dev, struct device_attribute *attr, char *buf) -@@ -209,13 +211,15 @@ static ssize_t id_show(struct device *de +@@ -187,13 +189,15 @@ static ssize_t id_show(struct device *de giodev = to_gio_device(dev); return sprintf(buf, "%x", giodev->id.id); } @@ -41,7 +41,7 @@ static int gio_device_uevent(struct device *dev, struct kobj_uevent_env *env) { -@@ -396,7 +400,7 @@ static void ip22_check_gio(int slotno, u +@@ -374,7 +378,7 @@ static void ip22_check_gio(int slotno, u static struct bus_type gio_bus_type = { .name = "gio", @@ -1,11 +1,47 @@ +0001-iop.c-move-assignment-out-of-if-block.patch +0002-amiserial.c-move-assignment-out-of-if-block.patch +0003-hvc_console.c-move-assignment-out-of-if-block.patch +0004-hvcs.c-move-assignment-out-of-if-block.patch +0005-68328serial.c-move-assignment-out-of-if-block.patch +0006-crisv10.c-move-assignment-out-of-if-block.patch +0007-icom.c-move-assignment-out-of-if-block.patch +0008-ioc3_serial.c-move-assignment-out-of-if-block.patch +0009-ioc4_serial.c-move-assignment-out-of-if-block.patch +0010-mpsc.c-move-assignment-out-of-if-block.patch +0011-synclink.c-move-assignment-out-of-if-block.patch +0012-synclink_gt.c-move-assignment-out-of-if-block.patch +0013-synclinkmp.c-move-assignment-out-of-if-block.patch +0014-tty_buffer.c-move-assignment-out-of-if-block.patch +0015-tty_ldsem.c-move-assignment-out-of-if-block.patch +0016-consolemap.c-move-assignment-out-of-if-block.patch +0017-speedtch.c-move-assignment-out-of-if-block.patch +0018-usbatm.c-move-assignment-out-of-if-block.patch +0019-xusbatm.c-move-assignment-out-of-if-block.patch +0020-usblp.c-move-assignment-out-of-if-block.patch +0021-devio.c-move-assignment-out-of-if-block.patch +0022-hcd.c-move-assignment-out-of-if-block.patch +0023-hub.c-move-assignment-out-of-if-block.patch +0024-inode.c-move-assignment-out-of-if-block.patch +0025-ehci-dbg.c-move-assignment-out-of-if-block.patch +0026-fusbh200-hcd.c-move-assignment-out-of-if-block.patch +0027-isp116x-hcd.c-move-assignment-out-of-if-block.patch +0028-ohci-dbg.c-move-assignment-out-of-if-block.patch +0029-ohci-hcd.c-move-assignment-out-of-if-block.patch +0030-ohci-q.c-move-assignment-out-of-if-block.patch +0031-sisusb.c-move-assignment-out-of-if-block.patch +0032-sisusb_con.c-move-assignment-out-of-if-block.patch +0033-uss720.c-move-assignment-out-of-if-block.patch +0034-mon_bin.c-move-assignment-out-of-if-block.patch +0035-mon_main.c-move-assignment-out-of-if-block.patch +0036-mon_stat.c-move-assignment-out-of-if-block.patch csdio2.patch -input-xpad-set-the-leds-properly-on-xbox-wireless-controllers.patch -defer-input-nodes-and-led-support -input-xpad-move-the-input-device-creation-to-a-new-function.patch -input-xpad-set-the-correct-led-number.patch -input-xpad-disconnect-all-wireless-controllers-at-init.patch -input-xpad-handle-present-and-gone-correctly.patch -input-xpad-properly-name-the-led-class-devices.patch +#input-xpad-set-the-leds-properly-on-xbox-wireless-controllers.patch +#defer-input-nodes-and-led-support +#input-xpad-move-the-input-device-creation-to-a-new-function.patch +#input-xpad-set-the-correct-led-number.patch +#input-xpad-disconnect-all-wireless-controllers-at-init.patch +#input-xpad-handle-present-and-gone-correctly.patch +#input-xpad-properly-name-the-led-class-devices.patch staging-exfat-add-filesystem-to-drivers-staging-exfat.patch diff --git a/simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch b/simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch index 1c9e827424d06a..50e12e96e797a2 100644 --- a/simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch +++ b/simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch @@ -75,7 +75,7 @@ Signed-off-by: Dirk Hohndel <dirk@hohndel.org> input_event(dev, EV_MSC, MSC_RAW, code); if (atkbd_platform_scancode_fixup) -@@ -995,6 +1017,48 @@ static unsigned int atkbd_oqo_01plus_sca +@@ -997,6 +1019,48 @@ static unsigned int atkbd_oqo_01plus_sca } /* @@ -124,7 +124,7 @@ Signed-off-by: Dirk Hohndel <dirk@hohndel.org> * atkbd_set_keycode_table() initializes keyboard's keycode table * according to the selected scancode set */ -@@ -1651,6 +1715,13 @@ static int __init atkbd_deactivate_fixup +@@ -1653,6 +1717,13 @@ static int __init atkbd_deactivate_fixup return 1; } @@ -138,7 +138,7 @@ Signed-off-by: Dirk Hohndel <dirk@hohndel.org> static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { { .matches = { -@@ -1794,6 +1865,15 @@ static const struct dmi_system_id atkbd_ +@@ -1796,6 +1867,15 @@ static const struct dmi_system_id atkbd_ }, .callback = atkbd_deactivate_fixup, }, diff --git a/staging-exfat-add-filesystem-to-the-build.patch b/staging-exfat-add-filesystem-to-the-build.patch index c35e8347e0d5db..f16ca496f85f85 100644 --- a/staging-exfat-add-filesystem-to-the-build.patch +++ b/staging-exfat-add-filesystem-to-the-build.patch @@ -18,19 +18,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -108,4 +108,6 @@ source "drivers/staging/skein/Kconfig" +@@ -108,4 +108,6 @@ source "drivers/staging/fbtft/Kconfig" - source "drivers/staging/unisys/Kconfig" + source "drivers/staging/i2o/Kconfig" +source "drivers/staging/exfat/Kconfig" + endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -46,3 +46,4 @@ obj-$(CONFIG_MTD_SPINAND_MT29F) += mt29f - obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/ - obj-$(CONFIG_CRYPTO_SKEIN) += skein/ - obj-$(CONFIG_UNISYSSPAR) += unisys/ +@@ -46,3 +46,4 @@ obj-$(CONFIG_UNISYSSPAR) += unisys/ + obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ + obj-$(CONFIG_FB_TFT) += fbtft/ + obj-$(CONFIG_I2O) += i2o/ +obj-$(CONFIG_EXFAT_FS) += exfat/ --- /dev/null +++ b/drivers/staging/exfat/Kconfig |