diff options
| author | Breno Leitao <leitao@linux.vnet.ibm.com> | 2009-06-11 14:02:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 17:51:02 +0200 |
| commit | aba6593bf77371e71331ba76dacc98b47760cba3 (patch) | |
| tree | ae324b0d1a419b2a2416c99d882c0a0c2211ffd3 | |
| parent | jsm: correctly support multiple 4/8-port boards (diff) | |
| download | linux-aba6593bf77371e71331ba76dacc98b47760cba3.tar.xz linux-aba6593bf77371e71331ba76dacc98b47760cba3.zip | |
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.c | 4 |
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) 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); |