openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: dgnc: fix checkpatch.pl usage of volatile. 

This is a patch to the dgnc_cls.c file that fixes up volatile usage
warning found by the checkpatch.pl tool

Signed-off-by: S. Stalin Srinivasan <stalinsrinivasan.s@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
stalinsrinivasan.s 2013-12-20 22:03:26 +05:30 committed by Greg Kroah-Hartman
parent cb3714a6b0
commit 9979ef7d73
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/dgnc/dgnc_cls.c
View File

@ -1151,7 +1151,8 @@ static void cls_copy_data_from_queue_to_uart(struct channel_t *ch)
static void cls_parse_modem(struct channel_t *ch, uchar signals) static void cls_parse_modem(struct channel_t *ch, uchar signals)
{ {
volatile uchar msignals = signals; uchar msignals = signals;
ulong lock_flags;
if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
return; return;
@ -1163,6 +1164,7 @@ static void cls_parse_modem(struct channel_t *ch, uchar signals)
* Do altpin switching. Altpin switches DCD and DSR. * Do altpin switching. Altpin switches DCD and DSR.
* This prolly breaks DSRPACE, so we should be more clever here. * This prolly breaks DSRPACE, so we should be more clever here.
*/ */
DGNC_LOCK(ch->ch_lock, lock_flags);
if (ch->ch_digi.digi_flags & DIGI_ALTPIN) { if (ch->ch_digi.digi_flags & DIGI_ALTPIN) {
uchar mswap = signals; uchar mswap = signals;
if (mswap & UART_MSR_DDCD) { if (mswap & UART_MSR_DDCD) {
@ -1182,6 +1184,7 @@ static void cls_parse_modem(struct channel_t *ch, uchar signals)
msignals |= UART_MSR_DCD; msignals |= UART_MSR_DCD;
} }
} }
DGNC_UNLOCK(ch->ch_lock, lock_flags);
/* /*
* Scrub off lower bits. They signify delta's, which I don't * Scrub off lower bits. They signify delta's, which I don't
@ -1189,6 +1192,7 @@ static void cls_parse_modem(struct channel_t *ch, uchar signals)
*/ */
signals &= 0xf0; signals &= 0xf0;
DGNC_LOCK(ch->ch_lock, lock_flags);
if (msignals & UART_MSR_DCD) if (msignals & UART_MSR_DCD)
ch->ch_mistat |= UART_MSR_DCD; ch->ch_mistat |= UART_MSR_DCD;
else else
@ -1208,6 +1212,7 @@ static void cls_parse_modem(struct channel_t *ch, uchar signals)
ch->ch_mistat |= UART_MSR_CTS; ch->ch_mistat |= UART_MSR_CTS;
else else
ch->ch_mistat &= ~UART_MSR_CTS; ch->ch_mistat &= ~UART_MSR_CTS;
DGNC_UNLOCK(ch->ch_lock, lock_flags);
DPR_MSIGS(( DPR_MSIGS((