From: Kevin McKinney Date: Sat, 5 Jan 2013 04:35:08 +0000 (-0500) Subject: Staging: bcm: Remove typedef for _S_BCM_DEBUG_STATE and call directly. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4b388a9e1da7156dbf924e38741beaac1b4e29d1;p=openwrt%2Fstaging%2Fblogic.git Staging: bcm: Remove typedef for _S_BCM_DEBUG_STATE and call directly. This patch removes typedef for _S_BCM_DEBUG_STATE, and changes the name of the struct to bcm_debug_state. In addition, any calls to struct "S_BCM_DEBUG_STATE" are changed to call directly. Signed-off-by: Kevin McKinney Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h index ade7bfd9cde3..1d8bf08b5bfd 100644 --- a/drivers/staging/bcm/Adapter.h +++ b/drivers/staging/bcm/Adapter.h @@ -392,7 +392,7 @@ struct bcm_mini_adapter { struct semaphore LowPowerModeSync; ULONG liDrainCalculated; UINT gpioBitMap; - S_BCM_DEBUG_STATE stDebugState; + struct bcm_debug_state stDebugState; }; #define GET_BCM_ADAPTER(net_dev) netdev_priv(net_dev) diff --git a/drivers/staging/bcm/Debug.h b/drivers/staging/bcm/Debug.h index 663325bc5ad7..e81db0d0f7a3 100644 --- a/drivers/staging/bcm/Debug.h +++ b/drivers/staging/bcm/Debug.h @@ -178,7 +178,7 @@ typedef struct { } __packed USER_BCM_DBG_STATE; /* ---Kernel-space mapping of Debug State */ -typedef struct _S_BCM_DEBUG_STATE { +struct bcm_debug_state { unsigned int type; /* A bitmap of 32 bits for Subtype per Type. * Valid indexes in 'subtype' array are *only* 1,2,4 and 8, @@ -187,7 +187,7 @@ typedef struct _S_BCM_DEBUG_STATE { */ unsigned int subtype[(NUMTYPES*2)+1]; unsigned int debug_level; -} S_BCM_DEBUG_STATE; +}; /* Instantiated in the Adapter structure * We'll reuse the debug level parameter to include a bit (the MSB) to indicate whether or not * we want the function's name printed.