Skip to content

Commit

Permalink
icom: fixing a if clause spaghetti
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Breno Leitao authored and Linus Torvalds committed Jun 11, 2009
1 parent 13858d3 commit aba6593
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/serial/icom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit aba6593

Please sign in to comment.