aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBreno Leitao <leitao@linux.vnet.ibm.com>2009-06-11 08:02:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 11:51:02 -0400
commitaba6593bf77371e71331ba76dacc98b47760cba3 (patch)
treeae324b0d1a419b2a2416c99d882c0a0c2211ffd3
parent13858d36903990441a89eb342247b71436808eeb (diff)
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: Breno Leitao <leitao@linux.vnet.ibm.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/serial/icom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index a461b3b2c72d..fd5fd23804bc 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -408,7 +408,7 @@ static void load_code(struct icom_port *icom_port)
408 release_firmware(fw); 408 release_firmware(fw);
409 409
410 /* Set Hardware level */ 410 /* Set Hardware level */
411 if ((icom_port->adapter->version | ADAPTER_V2) == ADAPTER_V2) 411 if (icom_port->adapter->version == ADAPTER_V2)
412 writeb(V2_HARDWARE, &(icom_port->dram->misc_flags)); 412 writeb(V2_HARDWARE, &(icom_port->dram->misc_flags));
413 413
414 /* Start the processor in Adapter */ 414 /* Start the processor in Adapter */
@@ -861,7 +861,7 @@ static irqreturn_t icom_interrupt(int irq, void *dev_id)
861 /* find icom_port for this interrupt */ 861 /* find icom_port for this interrupt */
862 icom_adapter = (struct icom_adapter *) dev_id; 862 icom_adapter = (struct icom_adapter *) dev_id;
863 863
864 if ((icom_adapter->version | ADAPTER_V2) == ADAPTER_V2) { 864 if (icom_adapter->version == ADAPTER_V2) {
865 int_reg = icom_adapter->base_addr + 0x8024; 865 int_reg = icom_adapter->base_addr + 0x8024;
866 866
867 adapter_interrupts = readl(int_reg); 867 adapter_interrupts = readl(int_reg);