Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

pcmcia: synclink_cs: replace sum of bitmasks with OR operation.

Browse Source 
Suggested by coccinelle and manually verified.

Signed-off-by: Alexandru Juncu <alexj@rosedu.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexandru Juncu 2013-07-19 11:24:03 +03:00 committed by Greg Kroah-Hartman
parent 26dac3c49d
commit ecda040ff3
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/char/pcmcia/synclink_cs.c
View File

@ -1182,14 +1182,14 @@ static irqreturn_t mgslpc_isr(int dummy, void *dev_id)
} }
count++; count++;
if (gis & (BIT1 + BIT0)) { if (gis & (BIT1 | BIT0)) {
isr = read_reg16(info, CHB + ISR); isr = read_reg16(info, CHB + ISR);
if (isr & IRQ_DCD) if (isr & IRQ_DCD)
dcd_change(info, tty); dcd_change(info, tty);
if (isr & IRQ_CTS) if (isr & IRQ_CTS)
cts_change(info, tty); cts_change(info, tty);
} }
if (gis & (BIT3 + BIT2)) if (gis & (BIT3 | BIT2))
{ {
isr = read_reg16(info, CHA + ISR); isr = read_reg16(info, CHA + ISR);
if (isr & IRQ_TIMER) { if (isr & IRQ_TIMER) {
@ -1210,7 +1210,7 @@ static irqreturn_t mgslpc_isr(int dummy, void *dev_id)
if (isr & IRQ_RXTIME) { if (isr & IRQ_RXTIME) {
issue_command(info, CHA, CMD_RXFIFO_READ); issue_command(info, CHA, CMD_RXFIFO_READ);
} }
if (isr & (IRQ_RXEOM + IRQ_RXFIFO)) { if (isr & (IRQ_RXEOM | IRQ_RXFIFO)) {
if (info->params.mode == MGSL_MODE_HDLC) if (info->params.mode == MGSL_MODE_HDLC)
rx_ready_hdlc(info, isr & IRQ_RXEOM); rx_ready_hdlc(info, isr & IRQ_RXEOM);
else else
@ -3031,11 +3031,11 @@ static void loopback_enable(MGSLPC_INFO *info)
unsigned char val; unsigned char val;
/* CCR1:02..00 CM[2..0] Clock Mode = 111 (clock mode 7) */ /* CCR1:02..00 CM[2..0] Clock Mode = 111 (clock mode 7) */
val = read_reg(info, CHA + CCR1) | (BIT2 + BIT1 + BIT0); val = read_reg(info, CHA + CCR1) | (BIT2 | BIT1 | BIT0);
write_reg(info, CHA + CCR1, val); write_reg(info, CHA + CCR1, val);
/* CCR2:04 SSEL Clock source select, 1=submode b */ /* CCR2:04 SSEL Clock source select, 1=submode b */
val = read_reg(info, CHA + CCR2) | (BIT4 + BIT5); val = read_reg(info, CHA + CCR2) | (BIT4 | BIT5);
write_reg(info, CHA + CCR2, val); write_reg(info, CHA + CCR2, val);
/* set LinkSpeed if available, otherwise default to 2Mbps */ /* set LinkSpeed if available, otherwise default to 2Mbps */
@ -3125,10 +3125,10 @@ static void hdlc_mode(MGSLPC_INFO *info)
val |= BIT4; val |= BIT4;
break; // FM0 break; // FM0
case HDLC_ENCODING_BIPHASE_MARK: case HDLC_ENCODING_BIPHASE_MARK:
val |= BIT4 + BIT2; val |= BIT4 | BIT2;
break; // FM1 break; // FM1
case HDLC_ENCODING_BIPHASE_LEVEL: case HDLC_ENCODING_BIPHASE_LEVEL:
val |= BIT4 + BIT3; val |= BIT4 | BIT3;
break; // Manchester break; // Manchester
} }
write_reg(info, CHA + CCR0, val); write_reg(info, CHA + CCR0, val);
@ -3185,7 +3185,7 @@ static void hdlc_mode(MGSLPC_INFO *info)
*/ */
val = 0x00; val = 0x00;
if (info->params.crc_type == HDLC_CRC_NONE) if (info->params.crc_type == HDLC_CRC_NONE)
val |= BIT2 + BIT1; val |= BIT2 | BIT1;
if (info->params.preamble != HDLC_PREAMBLE_PATTERN_NONE) if (info->params.preamble != HDLC_PREAMBLE_PATTERN_NONE)
val |= BIT5; val |= BIT5;
switch (info->params.preamble_length) switch (info->params.preamble_length)
@ -3197,7 +3197,7 @@ static void hdlc_mode(MGSLPC_INFO *info)
val |= BIT6; val |= BIT6;
break; break;
case HDLC_PREAMBLE_LENGTH_64BITS: case HDLC_PREAMBLE_LENGTH_64BITS:
val |= BIT7 + BIT6; val |= BIT7 | BIT6;
break; break;
} }
write_reg(info, CHA + CCR3, val); write_reg(info, CHA + CCR3, val);
@ -3264,8 +3264,8 @@ static void hdlc_mode(MGSLPC_INFO *info)
clear_reg_bits(info, CHA + PVR, BIT3); clear_reg_bits(info, CHA + PVR, BIT3);
irq_enable(info, CHA, irq_enable(info, CHA,
IRQ_RXEOM + IRQ_RXFIFO + IRQ_ALLSENT + IRQ_RXEOM | IRQ_RXFIFO | IRQ_ALLSENT |
IRQ_UNDERRUN + IRQ_TXFIFO); IRQ_UNDERRUN | IRQ_TXFIFO);
issue_command(info, CHA, CMD_TXRESET + CMD_RXRESET); issue_command(info, CHA, CMD_TXRESET + CMD_RXRESET);
wait_command_complete(info, CHA); wait_command_complete(info, CHA);
read_reg16(info, CHA + ISR); /* clear pending IRQs */ read_reg16(info, CHA + ISR); /* clear pending IRQs */
@ -3582,8 +3582,8 @@ static void async_mode(MGSLPC_INFO *info)
} else } else
clear_reg_bits(info, CHA + PVR, BIT3); clear_reg_bits(info, CHA + PVR, BIT3);
irq_enable(info, CHA, irq_enable(info, CHA,
IRQ_RXEOM + IRQ_RXFIFO + IRQ_BREAK_ON + IRQ_RXTIME + IRQ_RXEOM | IRQ_RXFIFO | IRQ_BREAK_ON | IRQ_RXTIME |
IRQ_ALLSENT + IRQ_TXFIFO); IRQ_ALLSENT | IRQ_TXFIFO);
issue_command(info, CHA, CMD_TXRESET + CMD_RXRESET); issue_command(info, CHA, CMD_TXRESET + CMD_RXRESET);
wait_command_complete(info, CHA); wait_command_complete(info, CHA);
read_reg16(info, CHA + ISR); /* clear pending IRQs */ read_reg16(info, CHA + ISR); /* clear pending IRQs */