forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging/rdma/hfi1: Fix camel case variables

Browse source 
physState, linkState, and devState should be phys_state, link_state, and
dev_state

Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ira Weiny 2015-12-02 00:43:33 -05:00 • committed by Greg Kroah-Hartman
parent c0d4c2582f
commit ae1724dffc
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
drivers/staging/rdma/hfi1/diag.c
View file

@ -972,9 +972,9 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
void *filter_value = NULL; void *filter_value = NULL;
long ret = 0; long ret = 0;
int value = 0; int value = 0;
u8 physState = 0; u8 phys_state = 0;
u8 linkState = 0; u8 link_state = 0;
u16 devState = 0; u16 dev_state = 0;
unsigned long flags = 0; unsigned long flags = 0;
unsigned long *argp = NULL; unsigned long *argp = NULL;
struct hfi1_packet_filter_command filter_cmd = {0}; struct hfi1_packet_filter_command filter_cmd = {0};
@ -1038,31 +1038,31 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
} }
/* What we want to transition to */ /* What we want to transition to */
physState = (value >> 4) & 0xF; phys_state = (value >> 4) & 0xF;
linkState = value & 0xF; link_state = value & 0xF;
snoop_dbg("Setting link state 0x%x", value); snoop_dbg("Setting link state 0x%x", value);
switch (linkState) { switch (link_state) {
case IB_PORT_NOP: case IB_PORT_NOP:
if (physState == 0) if (phys_state == 0)
break; break;
/* fall through */ /* fall through */
case IB_PORT_DOWN: case IB_PORT_DOWN:
switch (physState) { switch (phys_state) {
case 0: case 0:
devState = HLS_DN_DOWNDEF; dev_state = HLS_DN_DOWNDEF;
break; break;
case 2: case 2:
devState = HLS_DN_POLL; dev_state = HLS_DN_POLL;
break; break;
case 3: case 3:
devState = HLS_DN_DISABLE; dev_state = HLS_DN_DISABLE;
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
goto done; goto done;
} }
ret = set_link_state(ppd, devState); ret = set_link_state(ppd, dev_state);
break; break;
case IB_PORT_ARMED: case IB_PORT_ARMED:
ret = set_link_state(ppd, HLS_UP_ARMED); ret = set_link_state(ppd, HLS_UP_ARMED);