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/hif | |
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/hif')
3 files changed, 34 insertions, 34 deletions
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h index 857f35f36ca..f72ba6cf50c 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h | |||
@@ -58,7 +58,7 @@ typedef struct bus_request { | |||
58 | A_UINT32 length; | 58 | A_UINT32 length; |
59 | A_UINT32 request; | 59 | A_UINT32 request; |
60 | void *context; | 60 | void *context; |
61 | A_STATUS status; | 61 | int status; |
62 | struct _HIF_SCATTER_REQ_PRIV *pScatterReq; /* this request is a scatter request */ | 62 | struct _HIF_SCATTER_REQ_PRIV *pScatterReq; /* this request is a scatter request */ |
63 | } BUS_REQUEST; | 63 | } BUS_REQUEST; |
64 | 64 | ||
@@ -110,18 +110,18 @@ typedef struct _HIF_SCATTER_REQ_PRIV { | |||
110 | 110 | ||
111 | #define ATH_DEBUG_SCATTER ATH_DEBUG_MAKE_MODULE_MASK(0) | 111 | #define ATH_DEBUG_SCATTER ATH_DEBUG_MAKE_MODULE_MASK(0) |
112 | 112 | ||
113 | A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo); | 113 | int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo); |
114 | void CleanupHIFScatterResources(HIF_DEVICE *device); | 114 | void CleanupHIFScatterResources(HIF_DEVICE *device); |
115 | A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest); | 115 | int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest); |
116 | 116 | ||
117 | #else // HIF_LINUX_MMC_SCATTER_SUPPORT | 117 | #else // HIF_LINUX_MMC_SCATTER_SUPPORT |
118 | 118 | ||
119 | static inline A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo) | 119 | static inline int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo) |
120 | { | 120 | { |
121 | return A_ENOTSUP; | 121 | return A_ENOTSUP; |
122 | } | 122 | } |
123 | 123 | ||
124 | static inline A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest) | 124 | static inline int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest) |
125 | { | 125 | { |
126 | return A_ENOTSUP; | 126 | return A_ENOTSUP; |
127 | } | 127 | } |
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c index e96662b84ed..61166a5cb02 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | |||
@@ -107,8 +107,8 @@ extern A_UINT32 busspeedlow; | |||
107 | extern A_UINT32 debughif; | 107 | extern A_UINT32 debughif; |
108 | 108 | ||
109 | static void ResetAllCards(void); | 109 | static void ResetAllCards(void); |
110 | static A_STATUS hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func); | 110 | static int hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func); |
111 | static A_STATUS hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func); | 111 | static int hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func); |
112 | 112 | ||
113 | #ifdef DEBUG | 113 | #ifdef DEBUG |
114 | 114 | ||
@@ -123,7 +123,7 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(hif, | |||
123 | 123 | ||
124 | 124 | ||
125 | /* ------ Functions ------ */ | 125 | /* ------ Functions ------ */ |
126 | A_STATUS HIFInit(OSDRV_CALLBACKS *callbacks) | 126 | int HIFInit(OSDRV_CALLBACKS *callbacks) |
127 | { | 127 | { |
128 | int status; | 128 | int status; |
129 | AR_DEBUG_ASSERT(callbacks != NULL); | 129 | AR_DEBUG_ASSERT(callbacks != NULL); |
@@ -152,7 +152,7 @@ A_STATUS HIFInit(OSDRV_CALLBACKS *callbacks) | |||
152 | 152 | ||
153 | } | 153 | } |
154 | 154 | ||
155 | static A_STATUS | 155 | static int |
156 | __HIFReadWrite(HIF_DEVICE *device, | 156 | __HIFReadWrite(HIF_DEVICE *device, |
157 | A_UINT32 address, | 157 | A_UINT32 address, |
158 | A_UCHAR *buffer, | 158 | A_UCHAR *buffer, |
@@ -161,7 +161,7 @@ __HIFReadWrite(HIF_DEVICE *device, | |||
161 | void *context) | 161 | void *context) |
162 | { | 162 | { |
163 | A_UINT8 opcode; | 163 | A_UINT8 opcode; |
164 | A_STATUS status = A_OK; | 164 | int status = A_OK; |
165 | int ret; | 165 | int ret; |
166 | A_UINT8 *tbuffer; | 166 | A_UINT8 *tbuffer; |
167 | A_BOOL bounced = FALSE; | 167 | A_BOOL bounced = FALSE; |
@@ -329,7 +329,7 @@ void AddToAsyncList(HIF_DEVICE *device, BUS_REQUEST *busrequest) | |||
329 | 329 | ||
330 | 330 | ||
331 | /* queue a read/write request */ | 331 | /* queue a read/write request */ |
332 | A_STATUS | 332 | int |
333 | HIFReadWrite(HIF_DEVICE *device, | 333 | HIFReadWrite(HIF_DEVICE *device, |
334 | A_UINT32 address, | 334 | A_UINT32 address, |
335 | A_UCHAR *buffer, | 335 | A_UCHAR *buffer, |
@@ -337,7 +337,7 @@ HIFReadWrite(HIF_DEVICE *device, | |||
337 | A_UINT32 request, | 337 | A_UINT32 request, |
338 | void *context) | 338 | void *context) |
339 | { | 339 | { |
340 | A_STATUS status = A_OK; | 340 | int status = A_OK; |
341 | BUS_REQUEST *busrequest; | 341 | BUS_REQUEST *busrequest; |
342 | 342 | ||
343 | 343 | ||
@@ -375,7 +375,7 @@ HIFReadWrite(HIF_DEVICE *device, | |||
375 | /* interrupted, exit */ | 375 | /* interrupted, exit */ |
376 | return A_ERROR; | 376 | return A_ERROR; |
377 | } else { | 377 | } else { |
378 | A_STATUS status = busrequest->status; | 378 | int status = busrequest->status; |
379 | AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: sync return freeing 0x%lX: 0x%X\n", | 379 | AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: sync return freeing 0x%lX: 0x%X\n", |
380 | (unsigned long)busrequest, busrequest->status)); | 380 | (unsigned long)busrequest, busrequest->status)); |
381 | AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: freeing req: 0x%X\n", (unsigned int)request)); | 381 | AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: freeing req: 0x%X\n", (unsigned int)request)); |
@@ -402,7 +402,7 @@ static int async_task(void *param) | |||
402 | { | 402 | { |
403 | HIF_DEVICE *device; | 403 | HIF_DEVICE *device; |
404 | BUS_REQUEST *request; | 404 | BUS_REQUEST *request; |
405 | A_STATUS status; | 405 | int status; |
406 | unsigned long flags; | 406 | unsigned long flags; |
407 | 407 | ||
408 | device = (HIF_DEVICE *)param; | 408 | device = (HIF_DEVICE *)param; |
@@ -488,7 +488,7 @@ static A_INT32 IssueSDCommand(HIF_DEVICE *device, A_UINT32 opcode, A_UINT32 arg, | |||
488 | return err; | 488 | return err; |
489 | } | 489 | } |
490 | 490 | ||
491 | A_STATUS ReinitSDIO(HIF_DEVICE *device) | 491 | int ReinitSDIO(HIF_DEVICE *device) |
492 | { | 492 | { |
493 | A_INT32 err; | 493 | A_INT32 err; |
494 | struct mmc_host *host; | 494 | struct mmc_host *host; |
@@ -647,10 +647,10 @@ A_STATUS ReinitSDIO(HIF_DEVICE *device) | |||
647 | return (err) ? A_ERROR : A_OK; | 647 | return (err) ? A_ERROR : A_OK; |
648 | } | 648 | } |
649 | 649 | ||
650 | A_STATUS | 650 | int |
651 | PowerStateChangeNotify(HIF_DEVICE *device, HIF_DEVICE_POWER_CHANGE_TYPE config) | 651 | PowerStateChangeNotify(HIF_DEVICE *device, HIF_DEVICE_POWER_CHANGE_TYPE config) |
652 | { | 652 | { |
653 | A_STATUS status = A_OK; | 653 | int status = A_OK; |
654 | #if defined(CONFIG_PM) | 654 | #if defined(CONFIG_PM) |
655 | struct sdio_func *func = device->func; | 655 | struct sdio_func *func = device->func; |
656 | int old_reset_val; | 656 | int old_reset_val; |
@@ -690,12 +690,12 @@ PowerStateChangeNotify(HIF_DEVICE *device, HIF_DEVICE_POWER_CHANGE_TYPE config) | |||
690 | return status; | 690 | return status; |
691 | } | 691 | } |
692 | 692 | ||
693 | A_STATUS | 693 | int |
694 | HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode, | 694 | HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode, |
695 | void *config, A_UINT32 configLen) | 695 | void *config, A_UINT32 configLen) |
696 | { | 696 | { |
697 | A_UINT32 count; | 697 | A_UINT32 count; |
698 | A_STATUS status = A_OK; | 698 | int status = A_OK; |
699 | 699 | ||
700 | switch(opcode) { | 700 | switch(opcode) { |
701 | case HIF_DEVICE_GET_MBOX_BLOCK_SIZE: | 701 | case HIF_DEVICE_GET_MBOX_BLOCK_SIZE: |
@@ -774,7 +774,7 @@ HIFShutDownDevice(HIF_DEVICE *device) | |||
774 | static void | 774 | static void |
775 | hifIRQHandler(struct sdio_func *func) | 775 | hifIRQHandler(struct sdio_func *func) |
776 | { | 776 | { |
777 | A_STATUS status; | 777 | int status; |
778 | HIF_DEVICE *device; | 778 | HIF_DEVICE *device; |
779 | AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifIRQHandler\n")); | 779 | AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifIRQHandler\n")); |
780 | 780 | ||
@@ -949,10 +949,10 @@ hifFreeBusRequest(HIF_DEVICE *device, BUS_REQUEST *busrequest) | |||
949 | spin_unlock_irqrestore(&device->lock, flag); | 949 | spin_unlock_irqrestore(&device->lock, flag); |
950 | } | 950 | } |
951 | 951 | ||
952 | static A_STATUS hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func) | 952 | static int hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func) |
953 | { | 953 | { |
954 | int ret; | 954 | int ret; |
955 | A_STATUS status = A_OK; | 955 | int status = A_OK; |
956 | 956 | ||
957 | AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifDisableFunc\n")); | 957 | AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifDisableFunc\n")); |
958 | device = getHifDevice(func); | 958 | device = getHifDevice(func); |
@@ -1080,7 +1080,7 @@ static int hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func) | |||
1080 | static int hifDeviceSuspend(struct device *dev) | 1080 | static int hifDeviceSuspend(struct device *dev) |
1081 | { | 1081 | { |
1082 | struct sdio_func *func=dev_to_sdio_func(dev); | 1082 | struct sdio_func *func=dev_to_sdio_func(dev); |
1083 | A_STATUS status = A_OK; | 1083 | int status = A_OK; |
1084 | HIF_DEVICE *device; | 1084 | HIF_DEVICE *device; |
1085 | 1085 | ||
1086 | device = getHifDevice(func); | 1086 | device = getHifDevice(func); |
@@ -1107,7 +1107,7 @@ static int hifDeviceSuspend(struct device *dev) | |||
1107 | static int hifDeviceResume(struct device *dev) | 1107 | static int hifDeviceResume(struct device *dev) |
1108 | { | 1108 | { |
1109 | struct sdio_func *func=dev_to_sdio_func(dev); | 1109 | struct sdio_func *func=dev_to_sdio_func(dev); |
1110 | A_STATUS status = A_OK; | 1110 | int status = A_OK; |
1111 | HIF_DEVICE *device; | 1111 | HIF_DEVICE *device; |
1112 | 1112 | ||
1113 | device = getHifDevice(func); | 1113 | device = getHifDevice(func); |
@@ -1126,7 +1126,7 @@ static int hifDeviceResume(struct device *dev) | |||
1126 | 1126 | ||
1127 | static void hifDeviceRemoved(struct sdio_func *func) | 1127 | static void hifDeviceRemoved(struct sdio_func *func) |
1128 | { | 1128 | { |
1129 | A_STATUS status = A_OK; | 1129 | int status = A_OK; |
1130 | HIF_DEVICE *device; | 1130 | HIF_DEVICE *device; |
1131 | AR_DEBUG_ASSERT(func != NULL); | 1131 | AR_DEBUG_ASSERT(func != NULL); |
1132 | 1132 | ||
@@ -1151,11 +1151,11 @@ static void hifDeviceRemoved(struct sdio_func *func) | |||
1151 | /* | 1151 | /* |
1152 | * This should be moved to AR6K HTC layer. | 1152 | * This should be moved to AR6K HTC layer. |
1153 | */ | 1153 | */ |
1154 | A_STATUS hifWaitForPendingRecv(HIF_DEVICE *device) | 1154 | int hifWaitForPendingRecv(HIF_DEVICE *device) |
1155 | { | 1155 | { |
1156 | A_INT32 cnt = 10; | 1156 | A_INT32 cnt = 10; |
1157 | A_UINT8 host_int_status; | 1157 | A_UINT8 host_int_status; |
1158 | A_STATUS status = A_OK; | 1158 | int status = A_OK; |
1159 | 1159 | ||
1160 | do { | 1160 | do { |
1161 | while (atomic_read(&device->irqHandling)) { | 1161 | while (atomic_read(&device->irqHandling)) { |
@@ -1233,7 +1233,7 @@ void HIFReleaseDevice(HIF_DEVICE *device) | |||
1233 | device->claimedContext = NULL; | 1233 | device->claimedContext = NULL; |
1234 | } | 1234 | } |
1235 | 1235 | ||
1236 | A_STATUS HIFAttachHTC(HIF_DEVICE *device, HTC_CALLBACKS *callbacks) | 1236 | int HIFAttachHTC(HIF_DEVICE *device, HTC_CALLBACKS *callbacks) |
1237 | { | 1237 | { |
1238 | if (device->htcCallbacks.context != NULL) { | 1238 | if (device->htcCallbacks.context != NULL) { |
1239 | /* already in use! */ | 1239 | /* already in use! */ |
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c index ee8b47746a1..ceeced47cd2 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | |||
@@ -79,7 +79,7 @@ static HIF_SCATTER_REQ *AllocScatterReq(HIF_DEVICE *device) | |||
79 | } | 79 | } |
80 | 80 | ||
81 | /* called by async task to perform the operation synchronously using direct MMC APIs */ | 81 | /* called by async task to perform the operation synchronously using direct MMC APIs */ |
82 | A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest) | 82 | int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest) |
83 | { | 83 | { |
84 | int i; | 84 | int i; |
85 | A_UINT8 rw; | 85 | A_UINT8 rw; |
@@ -89,7 +89,7 @@ A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest) | |||
89 | struct mmc_data data; | 89 | struct mmc_data data; |
90 | HIF_SCATTER_REQ_PRIV *pReqPriv; | 90 | HIF_SCATTER_REQ_PRIV *pReqPriv; |
91 | HIF_SCATTER_REQ *pReq; | 91 | HIF_SCATTER_REQ *pReq; |
92 | A_STATUS status = A_OK; | 92 | int status = A_OK; |
93 | struct scatterlist *pSg; | 93 | struct scatterlist *pSg; |
94 | 94 | ||
95 | pReqPriv = busrequest->pScatterReq; | 95 | pReqPriv = busrequest->pScatterReq; |
@@ -199,9 +199,9 @@ A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | /* callback to issue a read-write scatter request */ | 201 | /* callback to issue a read-write scatter request */ |
202 | static A_STATUS HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq) | 202 | static int HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq) |
203 | { | 203 | { |
204 | A_STATUS status = A_EINVAL; | 204 | int status = A_EINVAL; |
205 | A_UINT32 request = pReq->Request; | 205 | A_UINT32 request = pReq->Request; |
206 | HIF_SCATTER_REQ_PRIV *pReqPriv = (HIF_SCATTER_REQ_PRIV *)pReq->HIFPrivate[0]; | 206 | HIF_SCATTER_REQ_PRIV *pReqPriv = (HIF_SCATTER_REQ_PRIV *)pReq->HIFPrivate[0]; |
207 | 207 | ||
@@ -275,9 +275,9 @@ static A_STATUS HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq) | |||
275 | } | 275 | } |
276 | 276 | ||
277 | /* setup of HIF scatter resources */ | 277 | /* setup of HIF scatter resources */ |
278 | A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo) | 278 | int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo) |
279 | { | 279 | { |
280 | A_STATUS status = A_ERROR; | 280 | int status = A_ERROR; |
281 | int i; | 281 | int i; |
282 | HIF_SCATTER_REQ_PRIV *pReqPriv; | 282 | HIF_SCATTER_REQ_PRIV *pReqPriv; |
283 | BUS_REQUEST *busrequest; | 283 | BUS_REQUEST *busrequest; |