aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Juncu <alexj@rosedu.org>2013-07-18 07:36:48 -0400
committerDavid S. Miller <davem@davemloft.net>2013-07-19 20:34:41 -0400
commit6e3d6774a7d59e33bebeb0ef66888bc7dbfed4c7 (patch)
tree812db19eecb9141d7af79a6b6e8c8345a7d61d12
parentaafee33423e78e86becda986b24a5819a7d16ff7 (diff)
mISDN: replace sum of bitmasks with OR operation.
Suggested by coccinelle and manually verified. Signed-off-by: Alexandru Juncu <alexj@rosedu.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/isdn/hardware/mISDN/hfcpci.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index a7e4939787c9..7f910c76ca0a 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)
1307 } 1307 }
1308 if (fifo2 & 2) { 1308 if (fifo2 & 2) {
1309 hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B2; 1309 hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B2;
1310 hc->hw.int_m1 &= ~(HFCPCI_INTS_B2TRANS + 1310 hc->hw.int_m1 &= ~(HFCPCI_INTS_B2TRANS |
1311 HFCPCI_INTS_B2REC); 1311 HFCPCI_INTS_B2REC);
1312 } else { 1312 } else {
1313 hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B1; 1313 hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B1;
1314 hc->hw.int_m1 &= ~(HFCPCI_INTS_B1TRANS + 1314 hc->hw.int_m1 &= ~(HFCPCI_INTS_B1TRANS |
1315 HFCPCI_INTS_B1REC); 1315 HFCPCI_INTS_B1REC);
1316 } 1316 }
1317#ifdef REVERSE_BITORDER 1317#ifdef REVERSE_BITORDER
@@ -1346,14 +1346,14 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
1346 if (fifo2 & 2) { 1346 if (fifo2 & 2) {
1347 hc->hw.fifo_en |= HFCPCI_FIFOEN_B2; 1347 hc->hw.fifo_en |= HFCPCI_FIFOEN_B2;
1348 if (!tics) 1348 if (!tics)
1349 hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS + 1349 hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS |
1350 HFCPCI_INTS_B2REC); 1350 HFCPCI_INTS_B2REC);
1351 hc->hw.ctmt |= 2; 1351 hc->hw.ctmt |= 2;
1352 hc->hw.conn &= ~0x18; 1352 hc->hw.conn &= ~0x18;
1353 } else { 1353 } else {
1354 hc->hw.fifo_en |= HFCPCI_FIFOEN_B1; 1354 hc->hw.fifo_en |= HFCPCI_FIFOEN_B1;
1355 if (!tics) 1355 if (!tics)
1356 hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS + 1356 hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS |
1357 HFCPCI_INTS_B1REC); 1357 HFCPCI_INTS_B1REC);
1358 hc->hw.ctmt |= 1; 1358 hc->hw.ctmt |= 1;
1359 hc->hw.conn &= ~0x03; 1359 hc->hw.conn &= ~0x03;
@@ -1375,14 +1375,14 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
1375 if (fifo2 & 2) { 1375 if (fifo2 & 2) {
1376 hc->hw.last_bfifo_cnt[1] = 0; 1376 hc->hw.last_bfifo_cnt[1] = 0;
1377 hc->hw.fifo_en |= HFCPCI_FIFOEN_B2; 1377 hc->hw.fifo_en |= HFCPCI_FIFOEN_B2;
1378 hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS + 1378 hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS |
1379 HFCPCI_INTS_B2REC); 1379 HFCPCI_INTS_B2REC);
1380 hc->hw.ctmt &= ~2; 1380 hc->hw.ctmt &= ~2;
1381 hc->hw.conn &= ~0x18; 1381 hc->hw.conn &= ~0x18;
1382 } else { 1382 } else {
1383 hc->hw.last_bfifo_cnt[0] = 0; 1383 hc->hw.last_bfifo_cnt[0] = 0;
1384 hc->hw.fifo_en |= HFCPCI_FIFOEN_B1; 1384 hc->hw.fifo_en |= HFCPCI_FIFOEN_B1;
1385 hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS + 1385 hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS |
1386 HFCPCI_INTS_B1REC); 1386 HFCPCI_INTS_B1REC);
1387 hc->hw.ctmt &= ~1; 1387 hc->hw.ctmt &= ~1;
1388 hc->hw.conn &= ~0x03; 1388 hc->hw.conn &= ~0x03;