Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e3d6774 authored by Alexandru Juncu's avatar Alexandru Juncu Committed by David S. Miller
Browse files

mISDN: replace sum of bitmasks with OR operation. 



Suggested by coccinelle and manually verified.

Signed-off-by: default avatarAlexandru Juncu <alexj@rosedu.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aafee334

drivers/isdn/hardware/mISDN/hfcpci.c

+6 −6
Original line number Diff line number Diff line
@@ -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;