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

Commit a0497289 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Change the name of typedef USER_BCM_DBG_STATE to bcm_user_debug_state. 



This patch removes typedef for USER_BCM_DBG_STATE, and
changes the name of the struct to bcm_user_debug_state.
In addition, any calls to struct "USER_BCM_DBG_STATE"
are changed to call directly.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b388a9e

drivers/staging/bcm/Bcmchar.c

+2 −2
Original line number Diff line number Diff line
@@ -1229,13 +1229,13 @@ cntrlEnd: 
	case IOCTL_BCM_SET_DEBUG:

#ifdef DEBUG

	{

		USER_BCM_DBG_STATE sUserDebugState;

		struct bcm_user_debug_state sUserDebugState;



		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "In SET_DEBUG ioctl\n");

		if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))

			return -EFAULT;



		if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer, sizeof(USER_BCM_DBG_STATE)))

		if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer, sizeof(struct bcm_user_debug_state)))

			return -EFAULT;



		BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL_BCM_SET_DEBUG: OnOff=%d Type = 0x%x ",

drivers/staging/bcm/Debug.h

+2 −2
Original line number Diff line number Diff line
@@ -171,11 +171,11 @@ 
 * Delibrately matches that of the Windows driver..

 * The TestApp's ioctl passes this struct to us.

 */

typedef struct {

struct bcm_user_debug_state {

	unsigned int Subtype, Type;

	unsigned int OnOff;

/*	unsigned int debug_level; future expansion */

} __packed USER_BCM_DBG_STATE;

} __packed;



/* ---Kernel-space mapping of Debug State */

struct bcm_debug_state {