Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / staging / bcm / led_control.h

diff --git a/drivers/staging/bcm/led_control.h b/drivers/staging/bcm/led_control.h
index 8b7dcdf5d3b43e9c21c5e1011fdfc047c5410da7..bae40e22e11bf30951d245fc5e5159f1da567fc8 100644 (file)
--- a/drivers/staging/bcm/led_control.h
+++ b/drivers/staging/bcm/led_control.h
@@ -31,16 +31,14 @@
                        wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG, &gpio_val, sizeof(gpio_val)); \
        } while (0)
 
-#define B_ULONG32 unsigned long
-
-typedef enum _LEDColors {
+enum bcm_led_colors {
        RED_LED         = 1,
        BLUE_LED        = 2,
        YELLOW_LED      = 3,
        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,
@@ -53,22 +51,22 @@ 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
  * and corresponding LED state information of driver states
  */
-typedef struct LedStateInfo_t {
+struct bcm_led_state_info {
        unsigned char LED_Type; /* specify GPIO number - use 0xFF if not used */
        unsigned char LED_On_State; /* Bits set or reset for different states */
        unsigned char LED_Blink_State; /* Bits set or reset for blinking LEDs for different states */
        unsigned char GPIO_Num;
        unsigned char BitPolarity; /* To represent whether H/W is normal polarity or reverse polarity */
-} LEDStateInfo, *pLEDStateInfo;
+};
 
 struct bcm_led_info {
-       LEDStateInfo    LEDState[NUM_OF_LEDS];
+       struct bcm_led_state_info LEDState[NUM_OF_LEDS];
        bool            bIdleMode_tx_from_host; /* Variable to notify whether driver came out from idlemode due to Host or target */
        bool            bIdle_led_off;
        wait_queue_head_t       notify_led_event;