Skip to content

Commit

Permalink
Staging: bcm: Remove typedef for LedEvents and call directly.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent dbe9a7d commit b3d9a8f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/bcm/Adapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ struct bcm_mini_adapter {
struct bcm_led_info LEDInfo;

/* Driver State for LED Blinking */
LedEventInfo_t DriverState;
enum bcm_led_events DriverState;
/* Interface Specific */
PVOID pvInterfaceAdapter;
int (*bcm_file_download)(PVOID,
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/bcm/led_control.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate)
ULONG timeout, INT num_of_time, enum bcm_led_events currdriverstate)
{
int Status = STATUS_SUCCESS;
BOOLEAN bInfinite = FALSE;
Expand Down Expand Up @@ -97,7 +97,7 @@ static INT ScaleRateofTransfer(ULONG rate)

static INT LED_Proportional_Blink(struct bcm_mini_adapter *Adapter, UCHAR GPIO_Num_tx,
UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex,
LedEventInfo_t currdriverstate)
enum bcm_led_events currdriverstate)
{
/* Initial values of TX and RX packets */
ULONG64 Initial_num_of_packts_tx = 0, Initial_num_of_packts_rx = 0;
Expand Down Expand Up @@ -607,7 +607,7 @@ static VOID LedGpioInit(struct bcm_mini_adapter *Adapter)

static INT BcmGetGPIOPinInfo(struct bcm_mini_adapter *Adapter, UCHAR *GPIO_num_tx,
UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,
LedEventInfo_t currdriverstate)
enum bcm_led_events currdriverstate)
{
UINT uiIndex = 0;

Expand Down Expand Up @@ -651,7 +651,7 @@ static VOID LEDControlThread(struct bcm_mini_adapter *Adapter)
UCHAR GPIO_num = 0;
UCHAR uiLedIndex = 0;
UINT uiResetValue = 0;
LedEventInfo_t currdriverstate = 0;
enum bcm_led_events currdriverstate = 0;
ulong timeout = 0;

INT Status = 0;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/bcm/led_control.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef enum _LEDColors {
GREEN_LED = 4
} LEDColors; /* Enumerated values of different LED types */

typedef enum LedEvents {
enum bcm_led_events {
SHUTDOWN_EXIT = 0x00,
DRIVER_INIT = 0x1,
FW_DOWNLOAD = 0x2,
Expand All @@ -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_ACTIVE = 0x200, /* Makes the LED Thread Active back. */
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
Expand Down

0 comments on commit b3d9a8f

Please sign in to comment.