evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: bcm: Bcmchar.c: Renamed variable: "sUserDebugState" -> "user_debug_state"

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthias Beyer 2014-08-27 12:57:54 +02:00 • committed by Greg Kroah-Hartman
parent 70edad0eaa
commit 0622a6f46c
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/staging/bcm/Bcmchar.c
View file

@ -1448,38 +1448,38 @@ static int bcm_char_ioctl_set_debug(void __user *argp,
{ {
#ifdef DEBUG #ifdef DEBUG
struct bcm_ioctl_buffer io_buff; struct bcm_ioctl_buffer io_buff;
struct bcm_user_debug_state sUserDebugState; struct bcm_user_debug_state user_debug_state;
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"In SET_DEBUG ioctl\n"); "In SET_DEBUG ioctl\n");
if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer))) if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT; return -EFAULT;
if (copy_from_user(&sUserDebugState, io_buff.InputBuffer, if (copy_from_user(&user_debug_state, io_buff.InputBuffer,
sizeof(struct bcm_user_debug_state))) sizeof(struct bcm_user_debug_state)))
return -EFAULT; return -EFAULT;
BCM_DEBUG_PRINT (ad, DBG_TYPE_PRINTK, 0, 0, BCM_DEBUG_PRINT (ad, DBG_TYPE_PRINTK, 0, 0,
"IOCTL_BCM_SET_DEBUG: OnOff=%d Type = 0x%x ", "IOCTL_BCM_SET_DEBUG: OnOff=%d Type = 0x%x ",
sUserDebugState.OnOff, sUserDebugState.Type); user_debug_state.OnOff, user_debug_state.Type);
/* sUserDebugState.Subtype <<= 1; */ /* user_debug_state.Subtype <<= 1; */
sUserDebugState.Subtype = 1 << sUserDebugState.Subtype; user_debug_state.Subtype = 1 << user_debug_state.Subtype;
BCM_DEBUG_PRINT (ad, DBG_TYPE_PRINTK, 0, 0, BCM_DEBUG_PRINT (ad, DBG_TYPE_PRINTK, 0, 0,
"actual Subtype=0x%x\n", sUserDebugState.Subtype); "actual Subtype=0x%x\n", user_debug_state.Subtype);
/* Update new 'DebugState' in the ad */ /* Update new 'DebugState' in the ad */
ad->stDebugState.type |= sUserDebugState.Type; ad->stDebugState.type |= user_debug_state.Type;
/* Subtype: A bitmap of 32 bits for Subtype per Type. /* Subtype: A bitmap of 32 bits for Subtype per Type.
* Valid indexes in 'subtype' array: 1,2,4,8 * Valid indexes in 'subtype' array: 1,2,4,8
* corresponding to valid Type values. Hence we can use the 'Type' field * corresponding to valid Type values. Hence we can use the 'Type' field
* as the index value, ignoring the array entries 0,3,5,6,7 ! * as the index value, ignoring the array entries 0,3,5,6,7 !
*/ */
if (sUserDebugState.OnOff) if (user_debug_state.OnOff)
ad->stDebugState.subtype[sUserDebugState.Type] |= ad->stDebugState.subtype[user_debug_state.Type] |=
sUserDebugState.Subtype; user_debug_state.Subtype;
else else
ad->stDebugState.subtype[sUserDebugState.Type] &= ad->stDebugState.subtype[user_debug_state.Type] &=
~sUserDebugState.Subtype; ~user_debug_state.Subtype;
BCM_SHOW_DEBUG_BITMAP(ad); BCM_SHOW_DEBUG_BITMAP(ad);
#endif #endif