From patchwork Thu Jul 18 11:36:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Juncu X-Patchwork-Id: 260043 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6529A2C00AB for ; Thu, 18 Jul 2013 21:38:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758661Ab3GRLhq (ORCPT ); Thu, 18 Jul 2013 07:37:46 -0400 Received: from mail-qe0-f43.google.com ([209.85.128.43]:64803 "EHLO mail-qe0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752703Ab3GRLhp (ORCPT ); Thu, 18 Jul 2013 07:37:45 -0400 Received: by mail-qe0-f43.google.com with SMTP id q19so1697584qeb.2 for ; Thu, 18 Jul 2013 04:37:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=9N1FnglRJGMbilqebC7LZfqTlZ9qPRGipCVdtWa7Fq0=; b=RukzU/PWOEK8u8kUXHCwsScnYyjd6JZQUd0Jzx7P1OIhm85l9npTNRmsAidnjdqHpJ YjhFmGofi/oTq4VByFuM9IwxZOmM5Rmbl+hx3YyOQUdvLj5SmeRM5v+AqyBBkxIcW0e4 5u6059RxsNrSS+jQqfFIrpAJ1dw10HpZQeLC3TYHKYSl86EssKt+NMBLq8hL+ExiYUu8 wni2UklIEA5smp6vWsUeT8jfnGXkqQY5zdplx0x4yK4zmN0QcUgUY7QHIlChw/CVtBQT Q8rWsa/8vHDUTNFb+Uv5aC77ji3Vw4S1jHix1Vd2VN9HmReqBBHESVCwa4D2yg/dJxHd 9WWA== X-Received: by 10.224.174.209 with SMTP id u17mr13283530qaz.6.1374147464253; Thu, 18 Jul 2013 04:37:44 -0700 (PDT) Received: from ixro-alexj.ixiacom.com ([205.168.23.154]) by mx.google.com with ESMTPSA id a8sm16029341qae.11.2013.07.18.04.37.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Jul 2013 04:37:43 -0700 (PDT) From: Alexandru Juncu To: isdn@linux-pingi.de Cc: standby24x7@gmail.com, davem@davemloft.net, gregkh@linuxfoundation.org, jkosina@suse.cz, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandru Juncu Subject: [PATCH] mISDN: replace sum of bitmasks with OR operation. Date: Thu, 18 Jul 2013 14:36:48 +0300 Message-Id: <1374147408-14890-1-git-send-email-alexj@rosedu.org> X-Mailer: git-send-email 1.8.1.2 X-Gm-Message-State: ALoCoQkXaGE6umUyPDLgcfbiXR5AJQDuAKYq9S57Fm/k0tnjI+LgYfZ4EElqK0OR874d3qQudYpZ Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Suggested by coccinelle and manually verified. Signed-off-by: Alexandru Juncu --- drivers/isdn/hardware/mISDN/hfcpci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index a7e4939..7f910c7 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c @@ -1307,11 +1307,11 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol) } if (fifo2 & 2) { hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B2; - hc->hw.int_m1 &= ~(HFCPCI_INTS_B2TRANS + + hc->hw.int_m1 &= ~(HFCPCI_INTS_B2TRANS | HFCPCI_INTS_B2REC); } else { hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B1; - hc->hw.int_m1 &= ~(HFCPCI_INTS_B1TRANS + + hc->hw.int_m1 &= ~(HFCPCI_INTS_B1TRANS | HFCPCI_INTS_B1REC); } #ifdef REVERSE_BITORDER @@ -1346,14 +1346,14 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol) if (fifo2 & 2) { hc->hw.fifo_en |= HFCPCI_FIFOEN_B2; if (!tics) - hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS + + hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS | HFCPCI_INTS_B2REC); hc->hw.ctmt |= 2; hc->hw.conn &= ~0x18; } else { hc->hw.fifo_en |= HFCPCI_FIFOEN_B1; if (!tics) - hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS + + hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS | HFCPCI_INTS_B1REC); hc->hw.ctmt |= 1; hc->hw.conn &= ~0x03; @@ -1375,14 +1375,14 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol) if (fifo2 & 2) { hc->hw.last_bfifo_cnt[1] = 0; hc->hw.fifo_en |= HFCPCI_FIFOEN_B2; - hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS + + hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS | HFCPCI_INTS_B2REC); hc->hw.ctmt &= ~2; hc->hw.conn &= ~0x18; } else { hc->hw.last_bfifo_cnt[0] = 0; hc->hw.fifo_en |= HFCPCI_FIFOEN_B1; - hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS + + hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS | HFCPCI_INTS_B1REC); hc->hw.ctmt &= ~1; hc->hw.conn &= ~0x03;