The patch titled icom: clean up an `if' clause has been added to the -mm tree. Its filename is icom-fixing-a-if-clause-spaghetti.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: icom: clean up an `if' clause From: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx> adapter->version can only be ADAPTER_V2 or ADAPTER_V1. So, that OR operand in the "if" clause is nonsense and can be removed. Signed-off-by: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx> Cc: Jiri Slaby <jirislaby@xxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/icom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/serial/icom.c~icom-fixing-a-if-clause-spaghetti drivers/serial/icom.c --- a/drivers/serial/icom.c~icom-fixing-a-if-clause-spaghetti +++ a/drivers/serial/icom.c @@ -413,7 +413,7 @@ static void load_code(struct 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 */ @@ -866,7 +866,7 @@ static irqreturn_t icom_interrupt(int ir /* 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); _ Patches currently in -mm which might be from leitao@xxxxxxxxxxxxxxxxxx are linux-next.patch icom-converting-space-to-tabs.patch icom-fix-compile-errors-when-defining-icom_trace.patch icom-fixing-a-if-clause-spaghetti.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html