Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aba6593b authored by Breno Leitao's avatar Breno Leitao Committed by Linus Torvalds
Browse files

icom: fixing a if clause spaghetti 



adapter->version can only be ADAPTER_V2 or ADAPTER_V1. So,
that OR operand in the "if" clause is non-sense and can be removed.

Signed-off-by: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 13858d36

drivers/serial/icom.c

+2 −2
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static void load_code(struct icom_port *icom_port) 
	release_firmware(fw);



	/* Set Hardware level */

	if ((icom_port->adapter->version | ADAPTER_V2) == ADAPTER_V2)

	if (icom_port->adapter->version == ADAPTER_V2)

		writeb(V2_HARDWARE, &(icom_port->dram->misc_flags));



	/* Start the processor in Adapter */
@@ -861,7 +861,7 @@ static irqreturn_t icom_interrupt(int irq, void *dev_id) 
	/* find icom_port for this interrupt */

	icom_adapter = (struct icom_adapter *) dev_id;



	if ((icom_adapter->version | ADAPTER_V2) == ADAPTER_V2) {

	if (icom_adapter->version == ADAPTER_V2) {

		int_reg = icom_adapter->base_addr + 0x8024;



		adapter_interrupts = readl(int_reg);