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: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index b034ace7eacd9886cf714d1e29f6799de4a17c35..4ba1a5d1bf96dc853d7cb26d5ef665893e75fc03 100644 (file)
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -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 ",

diff --git a/drivers/staging/bcm/Debug.h b/drivers/staging/bcm/Debug.h
index e81db0d0f7a3e9041cc7c7d71bc05bf5b9236c68..03be63fbff457a7107f5117d67a13a28afb710df 100644 (file)
--- a/drivers/staging/bcm/Debug.h
+++ b/drivers/staging/bcm/Debug.h
@@ -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 {