Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 23:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: bcm: Remove typedef for LedEvents and call directly.

Browse Source 
This patch removes typedef for LedEvents, and changes
the name of the enum to bcm_led_events. In addition,
any calls to LedEventInfo_t are changed to call directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kevin McKinney 2012-12-14 19:26:52 -05:00 committed by Greg Kroah-Hartman
parent dbe9a7d2d5
commit b3d9a8f727
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/bcm/Adapter.h
View File

@ -306,7 +306,7 @@ struct bcm_mini_adapter {
struct bcm_led_info LEDInfo; struct bcm_led_info LEDInfo;
/* Driver State for LED Blinking */ /* Driver State for LED Blinking */
LedEventInfo_t DriverState; enum bcm_led_events DriverState;
/* Interface Specific */ /* Interface Specific */
PVOID pvInterfaceAdapter; PVOID pvInterfaceAdapter;
int (*bcm_file_download)(PVOID, int (*bcm_file_download)(PVOID,

8
drivers/staging/bcm/led_control.c
View File

@ -24,7 +24,7 @@ BOOLEAN IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios)
} }
static INT LED_Blink(struct bcm_mini_adapter *Adapter, UINT GPIO_Num, UCHAR uiLedIndex, static INT LED_Blink(struct bcm_mini_adapter *Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate) ULONG timeout, INT num_of_time, enum bcm_led_events currdriverstate)
{ {
int Status = STATUS_SUCCESS; int Status = STATUS_SUCCESS;
BOOLEAN bInfinite = FALSE; BOOLEAN bInfinite = FALSE;
@ -97,7 +97,7 @@ static INT ScaleRateofTransfer(ULONG rate)
static INT LED_Proportional_Blink(struct bcm_mini_adapter *Adapter, UCHAR GPIO_Num_tx, static INT LED_Proportional_Blink(struct bcm_mini_adapter *Adapter, UCHAR GPIO_Num_tx,
UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex, UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex,
LedEventInfo_t currdriverstate) enum bcm_led_events currdriverstate)
{ {
/* Initial values of TX and RX packets */ /* Initial values of TX and RX packets */
ULONG64 Initial_num_of_packts_tx = 0, Initial_num_of_packts_rx = 0; ULONG64 Initial_num_of_packts_tx = 0, Initial_num_of_packts_rx = 0;
@ -607,7 +607,7 @@ static VOID LedGpioInit(struct bcm_mini_adapter *Adapter)
static INT BcmGetGPIOPinInfo(struct bcm_mini_adapter *Adapter, UCHAR *GPIO_num_tx, static INT BcmGetGPIOPinInfo(struct bcm_mini_adapter *Adapter, UCHAR *GPIO_num_tx,
UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex, UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,
LedEventInfo_t currdriverstate) enum bcm_led_events currdriverstate)
{ {
UINT uiIndex = 0; UINT uiIndex = 0;
@ -651,7 +651,7 @@ static VOID LEDControlThread(struct bcm_mini_adapter *Adapter)
UCHAR GPIO_num = 0; UCHAR GPIO_num = 0;
UCHAR uiLedIndex = 0; UCHAR uiLedIndex = 0;
UINT uiResetValue = 0; UINT uiResetValue = 0;
LedEventInfo_t currdriverstate = 0; enum bcm_led_events currdriverstate = 0;
ulong timeout = 0; ulong timeout = 0;
INT Status = 0; INT Status = 0;

4
drivers/staging/bcm/led_control.h
View File

@ -40,7 +40,7 @@ typedef enum _LEDColors {
GREEN_LED = 4 GREEN_LED = 4
} LEDColors; /* Enumerated values of different LED types */ } LEDColors; /* Enumerated values of different LED types */
typedef enum LedEvents { enum bcm_led_events {
SHUTDOWN_EXIT = 0x00, SHUTDOWN_EXIT = 0x00,
DRIVER_INIT = 0x1, DRIVER_INIT = 0x1,
FW_DOWNLOAD = 0x2, FW_DOWNLOAD = 0x2,
@ -53,7 +53,7 @@ typedef enum LedEvents {
LED_THREAD_INACTIVE = 0x100, /* Makes the LED thread Inactivce. It wil be equivallent to putting the thread on hold. */ LED_THREAD_INACTIVE = 0x100, /* Makes the LED thread Inactivce. It wil be equivallent to putting the thread on hold. */
LED_THREAD_ACTIVE = 0x200, /* Makes the LED Thread Active back. */ LED_THREAD_ACTIVE = 0x200, /* Makes the LED Thread Active back. */
DRIVER_HALT = 0xff DRIVER_HALT = 0xff
} LedEventInfo_t; /* Enumerated values of different driver states */ }; /* Enumerated values of different driver states */
/* /*
* Structure which stores the information of different LED types * Structure which stores the information of different LED types