Эх сурвалжийг харах

tty: 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: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Greg Kroah-Hartman 10 жил өмнө
parent
commit
9ff46047b6

+ 8 - 4
drivers/tty/serial/crisv10.c

@@ -1635,7 +1635,8 @@ alloc_recv_buffer(unsigned int size)
 {
 {
 	struct etrax_recv_buffer *buffer;
 	struct etrax_recv_buffer *buffer;
 
 
-	if (!(buffer = kmalloc(sizeof *buffer + size, GFP_ATOMIC)))
+	buffer = kmalloc(sizeof *buffer + size, GFP_ATOMIC);
+	if (!buffer)
 		return NULL;
 		return NULL;
 
 
 	buffer->next = NULL;
 	buffer->next = NULL;
@@ -1671,7 +1672,8 @@ add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char fl
 {
 {
 	struct etrax_recv_buffer *buffer;
 	struct etrax_recv_buffer *buffer;
 	if (info->uses_dma_in) {
 	if (info->uses_dma_in) {
-		if (!(buffer = alloc_recv_buffer(4)))
+		buffer = alloc_recv_buffer(4);
+		if (!buffer)
 			return 0;
 			return 0;
 
 
 		buffer->length = 1;
 		buffer->length = 1;
@@ -1709,7 +1711,8 @@ static unsigned int handle_descr_data(struct e100_serial *info,
 
 
 	append_recv_buffer(info, buffer);
 	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__);
 		panic("%s: Failed to allocate memory for receive buffer!\n", __func__);
 
 
 	descr->buf = virt_to_phys(buffer->buffer);
 	descr->buf = virt_to_phys(buffer->buffer);
@@ -1825,7 +1828,8 @@ static int start_recv_dma(struct e100_serial *info)
 
 
 	/* Set up the receiving descriptors */
 	/* Set up the receiving descriptors */
 	for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++) {
 	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__);
 			panic("%s: Failed to allocate memory for receive buffer!\n", __func__);
 
 
 		descr[i].ctrl = d_int;
 		descr[i].ctrl = d_int;