diff options
author | Joe Perches <joe@perches.com> | 2011-01-27 23:04:19 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 16:53:11 -0500 |
commit | 1f4c34bded914e81b4388ccfdfab8a31da5ab0c3 (patch) | |
tree | 17143db6180c0e30c4634f69d67e67d761fc37e1 /drivers/staging/ath6kl/os/linux/ar6000_pm.c | |
parent | a789325dc3aa89bb5001d26b542d7abc775b46f1 (diff) |
staging: ath6kl: Convert enum A_STATUS to int
Convert enum members to int as well.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Vipin Mehta <vipin.mehta@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/os/linux/ar6000_pm.c')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_pm.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c index 13195d4c742..fbac26429d8 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c | |||
@@ -57,7 +57,7 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(pm, | |||
57 | 57 | ||
58 | #endif /* DEBUG */ | 58 | #endif /* DEBUG */ |
59 | 59 | ||
60 | A_STATUS ar6000_exit_cut_power_state(AR_SOFTC_T *ar); | 60 | int ar6000_exit_cut_power_state(AR_SOFTC_T *ar); |
61 | 61 | ||
62 | #ifdef CONFIG_PM | 62 | #ifdef CONFIG_PM |
63 | static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, A_BOOL asleep) | 63 | static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, A_BOOL asleep) |
@@ -122,7 +122,7 @@ static void ar6000_wow_suspend(AR_SOFTC_T *ar) | |||
122 | struct in_ifaddr *ifa = NULL; | 122 | struct in_ifaddr *ifa = NULL; |
123 | struct in_device *in_dev; | 123 | struct in_device *in_dev; |
124 | A_UINT8 macMask[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; | 124 | A_UINT8 macMask[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; |
125 | A_STATUS status; | 125 | int status; |
126 | WMI_ADD_WOW_PATTERN_CMD addWowCmd = { .filter = { 0 } }; | 126 | WMI_ADD_WOW_PATTERN_CMD addWowCmd = { .filter = { 0 } }; |
127 | WMI_DEL_WOW_PATTERN_CMD delWowCmd; | 127 | WMI_DEL_WOW_PATTERN_CMD delWowCmd; |
128 | WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode = {FALSE, TRUE}; | 128 | WMI_SET_HOST_SLEEP_MODE_CMD hostSleepMode = {FALSE, TRUE}; |
@@ -211,9 +211,9 @@ static void ar6000_wow_suspend(AR_SOFTC_T *ar) | |||
211 | } | 211 | } |
212 | } | 212 | } |
213 | 213 | ||
214 | A_STATUS ar6000_suspend_ev(void *context) | 214 | int ar6000_suspend_ev(void *context) |
215 | { | 215 | { |
216 | A_STATUS status = A_OK; | 216 | int status = A_OK; |
217 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; | 217 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; |
218 | A_INT16 pmmode = ar->arSuspendConfig; | 218 | A_INT16 pmmode = ar->arSuspendConfig; |
219 | wow_not_connected: | 219 | wow_not_connected: |
@@ -248,7 +248,7 @@ wow_not_connected: | |||
248 | return status; | 248 | return status; |
249 | } | 249 | } |
250 | 250 | ||
251 | A_STATUS ar6000_resume_ev(void *context) | 251 | int ar6000_resume_ev(void *context) |
252 | { | 252 | { |
253 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; | 253 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; |
254 | A_UINT16 powerState = ar->arWlanPowerState; | 254 | A_UINT16 powerState = ar->arWlanPowerState; |
@@ -290,10 +290,10 @@ void ar6000_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, A_BOOL isEvent | |||
290 | } | 290 | } |
291 | } | 291 | } |
292 | 292 | ||
293 | A_STATUS ar6000_power_change_ev(void *context, A_UINT32 config) | 293 | int ar6000_power_change_ev(void *context, A_UINT32 config) |
294 | { | 294 | { |
295 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; | 295 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; |
296 | A_STATUS status = A_OK; | 296 | int status = A_OK; |
297 | 297 | ||
298 | AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: power change event callback %d \n", __func__, config)); | 298 | AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: power change event callback %d \n", __func__, config)); |
299 | switch (config) { | 299 | switch (config) { |
@@ -342,10 +342,10 @@ static struct platform_driver ar6000_pm_device = { | |||
342 | }; | 342 | }; |
343 | #endif /* CONFIG_PM */ | 343 | #endif /* CONFIG_PM */ |
344 | 344 | ||
345 | A_STATUS | 345 | int |
346 | ar6000_setup_cut_power_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) | 346 | ar6000_setup_cut_power_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) |
347 | { | 347 | { |
348 | A_STATUS status = A_OK; | 348 | int status = A_OK; |
349 | HIF_DEVICE_POWER_CHANGE_TYPE config; | 349 | HIF_DEVICE_POWER_CHANGE_TYPE config; |
350 | 350 | ||
351 | AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: Cut power %d %d \n", __func__,state, ar->arWlanPowerState)); | 351 | AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: Cut power %d %d \n", __func__,state, ar->arWlanPowerState)); |
@@ -412,10 +412,10 @@ ar6000_setup_cut_power_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) | |||
412 | return status; | 412 | return status; |
413 | } | 413 | } |
414 | 414 | ||
415 | A_STATUS | 415 | int |
416 | ar6000_setup_deep_sleep_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) | 416 | ar6000_setup_deep_sleep_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) |
417 | { | 417 | { |
418 | A_STATUS status = A_OK; | 418 | int status = A_OK; |
419 | 419 | ||
420 | AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: Deep sleep %d %d \n", __func__,state, ar->arWlanPowerState)); | 420 | AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: Deep sleep %d %d \n", __func__,state, ar->arWlanPowerState)); |
421 | #ifdef CONFIG_PM | 421 | #ifdef CONFIG_PM |
@@ -536,10 +536,10 @@ ar6000_setup_deep_sleep_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) | |||
536 | return status; | 536 | return status; |
537 | } | 537 | } |
538 | 538 | ||
539 | A_STATUS | 539 | int |
540 | ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, A_BOOL pmEvent) | 540 | ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, A_BOOL pmEvent) |
541 | { | 541 | { |
542 | A_STATUS status = A_OK; | 542 | int status = A_OK; |
543 | A_UINT16 powerState, oldPowerState; | 543 | A_UINT16 powerState, oldPowerState; |
544 | AR6000_WLAN_STATE oldstate = ar->arWlanState; | 544 | AR6000_WLAN_STATE oldstate = ar->arWlanState; |
545 | A_BOOL wlanOff = ar->arWlanOff; | 545 | A_BOOL wlanOff = ar->arWlanOff; |
@@ -650,12 +650,12 @@ ar6000_update_wlan_pwr_state(struct ar6_softc *ar, AR6000_WLAN_STATE state, A_BO | |||
650 | return status; | 650 | return status; |
651 | } | 651 | } |
652 | 652 | ||
653 | A_STATUS | 653 | int |
654 | ar6000_set_bt_hw_state(struct ar6_softc *ar, A_UINT32 enable) | 654 | ar6000_set_bt_hw_state(struct ar6_softc *ar, A_UINT32 enable) |
655 | { | 655 | { |
656 | #ifdef CONFIG_PM | 656 | #ifdef CONFIG_PM |
657 | A_BOOL off = (enable == 0); | 657 | A_BOOL off = (enable == 0); |
658 | A_STATUS status; | 658 | int status; |
659 | if (ar->arBTOff == off) { | 659 | if (ar->arBTOff == off) { |
660 | return A_OK; | 660 | return A_OK; |
661 | } | 661 | } |
@@ -667,10 +667,10 @@ ar6000_set_bt_hw_state(struct ar6_softc *ar, A_UINT32 enable) | |||
667 | #endif | 667 | #endif |
668 | } | 668 | } |
669 | 669 | ||
670 | A_STATUS | 670 | int |
671 | ar6000_set_wlan_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) | 671 | ar6000_set_wlan_state(struct ar6_softc *ar, AR6000_WLAN_STATE state) |
672 | { | 672 | { |
673 | A_STATUS status; | 673 | int status; |
674 | A_BOOL off = (state == WLAN_DISABLED); | 674 | A_BOOL off = (state == WLAN_DISABLED); |
675 | if (ar->arWlanOff == off) { | 675 | if (ar->arWlanOff == off) { |
676 | return A_OK; | 676 | return A_OK; |