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/bmi/src/bmi.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/bmi/src/bmi.c')
-rw-r--r-- | drivers/staging/ath6kl/bmi/src/bmi.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/drivers/staging/ath6kl/bmi/src/bmi.c b/drivers/staging/ath6kl/bmi/src/bmi.c index f17f5636f5b..a782166875e 100644 --- a/drivers/staging/ath6kl/bmi/src/bmi.c +++ b/drivers/staging/ath6kl/bmi/src/bmi.c | |||
@@ -105,10 +105,10 @@ BMICleanup(void) | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | A_STATUS | 108 | int |
109 | BMIDone(HIF_DEVICE *device) | 109 | BMIDone(HIF_DEVICE *device) |
110 | { | 110 | { |
111 | A_STATUS status; | 111 | int status; |
112 | A_UINT32 cid; | 112 | A_UINT32 cid; |
113 | 113 | ||
114 | if (bmiDone) { | 114 | if (bmiDone) { |
@@ -141,10 +141,10 @@ BMIDone(HIF_DEVICE *device) | |||
141 | return A_OK; | 141 | return A_OK; |
142 | } | 142 | } |
143 | 143 | ||
144 | A_STATUS | 144 | int |
145 | BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info) | 145 | BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info) |
146 | { | 146 | { |
147 | A_STATUS status; | 147 | int status; |
148 | A_UINT32 cid; | 148 | A_UINT32 cid; |
149 | 149 | ||
150 | if (bmiDone) { | 150 | if (bmiDone) { |
@@ -200,14 +200,14 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info) | |||
200 | return A_OK; | 200 | return A_OK; |
201 | } | 201 | } |
202 | 202 | ||
203 | A_STATUS | 203 | int |
204 | BMIReadMemory(HIF_DEVICE *device, | 204 | BMIReadMemory(HIF_DEVICE *device, |
205 | A_UINT32 address, | 205 | A_UINT32 address, |
206 | A_UCHAR *buffer, | 206 | A_UCHAR *buffer, |
207 | A_UINT32 length) | 207 | A_UINT32 length) |
208 | { | 208 | { |
209 | A_UINT32 cid; | 209 | A_UINT32 cid; |
210 | A_STATUS status; | 210 | int status; |
211 | A_UINT32 offset; | 211 | A_UINT32 offset; |
212 | A_UINT32 remaining, rxlen; | 212 | A_UINT32 remaining, rxlen; |
213 | 213 | ||
@@ -256,14 +256,14 @@ BMIReadMemory(HIF_DEVICE *device, | |||
256 | return A_OK; | 256 | return A_OK; |
257 | } | 257 | } |
258 | 258 | ||
259 | A_STATUS | 259 | int |
260 | BMIWriteMemory(HIF_DEVICE *device, | 260 | BMIWriteMemory(HIF_DEVICE *device, |
261 | A_UINT32 address, | 261 | A_UINT32 address, |
262 | A_UCHAR *buffer, | 262 | A_UCHAR *buffer, |
263 | A_UINT32 length) | 263 | A_UINT32 length) |
264 | { | 264 | { |
265 | A_UINT32 cid; | 265 | A_UINT32 cid; |
266 | A_STATUS status; | 266 | int status; |
267 | A_UINT32 offset; | 267 | A_UINT32 offset; |
268 | A_UINT32 remaining, txlen; | 268 | A_UINT32 remaining, txlen; |
269 | const A_UINT32 header = sizeof(cid) + sizeof(address) + sizeof(length); | 269 | const A_UINT32 header = sizeof(cid) + sizeof(address) + sizeof(length); |
@@ -321,13 +321,13 @@ BMIWriteMemory(HIF_DEVICE *device, | |||
321 | return A_OK; | 321 | return A_OK; |
322 | } | 322 | } |
323 | 323 | ||
324 | A_STATUS | 324 | int |
325 | BMIExecute(HIF_DEVICE *device, | 325 | BMIExecute(HIF_DEVICE *device, |
326 | A_UINT32 address, | 326 | A_UINT32 address, |
327 | A_UINT32 *param) | 327 | A_UINT32 *param) |
328 | { | 328 | { |
329 | A_UINT32 cid; | 329 | A_UINT32 cid; |
330 | A_STATUS status; | 330 | int status; |
331 | A_UINT32 offset; | 331 | A_UINT32 offset; |
332 | 332 | ||
333 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param))); | 333 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param))); |
@@ -369,12 +369,12 @@ BMIExecute(HIF_DEVICE *device, | |||
369 | return A_OK; | 369 | return A_OK; |
370 | } | 370 | } |
371 | 371 | ||
372 | A_STATUS | 372 | int |
373 | BMISetAppStart(HIF_DEVICE *device, | 373 | BMISetAppStart(HIF_DEVICE *device, |
374 | A_UINT32 address) | 374 | A_UINT32 address) |
375 | { | 375 | { |
376 | A_UINT32 cid; | 376 | A_UINT32 cid; |
377 | A_STATUS status; | 377 | int status; |
378 | A_UINT32 offset; | 378 | A_UINT32 offset; |
379 | 379 | ||
380 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); | 380 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); |
@@ -406,13 +406,13 @@ BMISetAppStart(HIF_DEVICE *device, | |||
406 | return A_OK; | 406 | return A_OK; |
407 | } | 407 | } |
408 | 408 | ||
409 | A_STATUS | 409 | int |
410 | BMIReadSOCRegister(HIF_DEVICE *device, | 410 | BMIReadSOCRegister(HIF_DEVICE *device, |
411 | A_UINT32 address, | 411 | A_UINT32 address, |
412 | A_UINT32 *param) | 412 | A_UINT32 *param) |
413 | { | 413 | { |
414 | A_UINT32 cid; | 414 | A_UINT32 cid; |
415 | A_STATUS status; | 415 | int status; |
416 | A_UINT32 offset; | 416 | A_UINT32 offset; |
417 | 417 | ||
418 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); | 418 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); |
@@ -452,13 +452,13 @@ BMIReadSOCRegister(HIF_DEVICE *device, | |||
452 | return A_OK; | 452 | return A_OK; |
453 | } | 453 | } |
454 | 454 | ||
455 | A_STATUS | 455 | int |
456 | BMIWriteSOCRegister(HIF_DEVICE *device, | 456 | BMIWriteSOCRegister(HIF_DEVICE *device, |
457 | A_UINT32 address, | 457 | A_UINT32 address, |
458 | A_UINT32 param) | 458 | A_UINT32 param) |
459 | { | 459 | { |
460 | A_UINT32 cid; | 460 | A_UINT32 cid; |
461 | A_STATUS status; | 461 | int status; |
462 | A_UINT32 offset; | 462 | A_UINT32 offset; |
463 | 463 | ||
464 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param))); | 464 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param))); |
@@ -492,7 +492,7 @@ BMIWriteSOCRegister(HIF_DEVICE *device, | |||
492 | return A_OK; | 492 | return A_OK; |
493 | } | 493 | } |
494 | 494 | ||
495 | A_STATUS | 495 | int |
496 | BMIrompatchInstall(HIF_DEVICE *device, | 496 | BMIrompatchInstall(HIF_DEVICE *device, |
497 | A_UINT32 ROM_addr, | 497 | A_UINT32 ROM_addr, |
498 | A_UINT32 RAM_addr, | 498 | A_UINT32 RAM_addr, |
@@ -501,7 +501,7 @@ BMIrompatchInstall(HIF_DEVICE *device, | |||
501 | A_UINT32 *rompatch_id) | 501 | A_UINT32 *rompatch_id) |
502 | { | 502 | { |
503 | A_UINT32 cid; | 503 | A_UINT32 cid; |
504 | A_STATUS status; | 504 | int status; |
505 | A_UINT32 offset; | 505 | A_UINT32 offset; |
506 | 506 | ||
507 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) + | 507 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) + |
@@ -548,12 +548,12 @@ BMIrompatchInstall(HIF_DEVICE *device, | |||
548 | return A_OK; | 548 | return A_OK; |
549 | } | 549 | } |
550 | 550 | ||
551 | A_STATUS | 551 | int |
552 | BMIrompatchUninstall(HIF_DEVICE *device, | 552 | BMIrompatchUninstall(HIF_DEVICE *device, |
553 | A_UINT32 rompatch_id) | 553 | A_UINT32 rompatch_id) |
554 | { | 554 | { |
555 | A_UINT32 cid; | 555 | A_UINT32 cid; |
556 | A_STATUS status; | 556 | int status; |
557 | A_UINT32 offset; | 557 | A_UINT32 offset; |
558 | 558 | ||
559 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(rompatch_id))); | 559 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(rompatch_id))); |
@@ -585,14 +585,14 @@ BMIrompatchUninstall(HIF_DEVICE *device, | |||
585 | return A_OK; | 585 | return A_OK; |
586 | } | 586 | } |
587 | 587 | ||
588 | static A_STATUS | 588 | static int |
589 | _BMIrompatchChangeActivation(HIF_DEVICE *device, | 589 | _BMIrompatchChangeActivation(HIF_DEVICE *device, |
590 | A_UINT32 rompatch_count, | 590 | A_UINT32 rompatch_count, |
591 | A_UINT32 *rompatch_list, | 591 | A_UINT32 *rompatch_list, |
592 | A_UINT32 do_activate) | 592 | A_UINT32 do_activate) |
593 | { | 593 | { |
594 | A_UINT32 cid; | 594 | A_UINT32 cid; |
595 | A_STATUS status; | 595 | int status; |
596 | A_UINT32 offset; | 596 | A_UINT32 offset; |
597 | A_UINT32 length; | 597 | A_UINT32 length; |
598 | 598 | ||
@@ -629,7 +629,7 @@ _BMIrompatchChangeActivation(HIF_DEVICE *device, | |||
629 | return A_OK; | 629 | return A_OK; |
630 | } | 630 | } |
631 | 631 | ||
632 | A_STATUS | 632 | int |
633 | BMIrompatchActivate(HIF_DEVICE *device, | 633 | BMIrompatchActivate(HIF_DEVICE *device, |
634 | A_UINT32 rompatch_count, | 634 | A_UINT32 rompatch_count, |
635 | A_UINT32 *rompatch_list) | 635 | A_UINT32 *rompatch_list) |
@@ -637,7 +637,7 @@ BMIrompatchActivate(HIF_DEVICE *device, | |||
637 | return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 1); | 637 | return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 1); |
638 | } | 638 | } |
639 | 639 | ||
640 | A_STATUS | 640 | int |
641 | BMIrompatchDeactivate(HIF_DEVICE *device, | 641 | BMIrompatchDeactivate(HIF_DEVICE *device, |
642 | A_UINT32 rompatch_count, | 642 | A_UINT32 rompatch_count, |
643 | A_UINT32 *rompatch_list) | 643 | A_UINT32 *rompatch_list) |
@@ -645,13 +645,13 @@ BMIrompatchDeactivate(HIF_DEVICE *device, | |||
645 | return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 0); | 645 | return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 0); |
646 | } | 646 | } |
647 | 647 | ||
648 | A_STATUS | 648 | int |
649 | BMILZData(HIF_DEVICE *device, | 649 | BMILZData(HIF_DEVICE *device, |
650 | A_UCHAR *buffer, | 650 | A_UCHAR *buffer, |
651 | A_UINT32 length) | 651 | A_UINT32 length) |
652 | { | 652 | { |
653 | A_UINT32 cid; | 653 | A_UINT32 cid; |
654 | A_STATUS status; | 654 | int status; |
655 | A_UINT32 offset; | 655 | A_UINT32 offset; |
656 | A_UINT32 remaining, txlen; | 656 | A_UINT32 remaining, txlen; |
657 | const A_UINT32 header = sizeof(cid) + sizeof(length); | 657 | const A_UINT32 header = sizeof(cid) + sizeof(length); |
@@ -695,12 +695,12 @@ BMILZData(HIF_DEVICE *device, | |||
695 | return A_OK; | 695 | return A_OK; |
696 | } | 696 | } |
697 | 697 | ||
698 | A_STATUS | 698 | int |
699 | BMILZStreamStart(HIF_DEVICE *device, | 699 | BMILZStreamStart(HIF_DEVICE *device, |
700 | A_UINT32 address) | 700 | A_UINT32 address) |
701 | { | 701 | { |
702 | A_UINT32 cid; | 702 | A_UINT32 cid; |
703 | A_STATUS status; | 703 | int status; |
704 | A_UINT32 offset; | 704 | A_UINT32 offset; |
705 | 705 | ||
706 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); | 706 | A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); |
@@ -733,12 +733,12 @@ BMILZStreamStart(HIF_DEVICE *device, | |||
733 | } | 733 | } |
734 | 734 | ||
735 | /* BMI Access routines */ | 735 | /* BMI Access routines */ |
736 | A_STATUS | 736 | int |
737 | bmiBufferSend(HIF_DEVICE *device, | 737 | bmiBufferSend(HIF_DEVICE *device, |
738 | A_UCHAR *buffer, | 738 | A_UCHAR *buffer, |
739 | A_UINT32 length) | 739 | A_UINT32 length) |
740 | { | 740 | { |
741 | A_STATUS status; | 741 | int status; |
742 | A_UINT32 timeout; | 742 | A_UINT32 timeout; |
743 | A_UINT32 address; | 743 | A_UINT32 address; |
744 | A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX]; | 744 | A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX]; |
@@ -781,13 +781,13 @@ bmiBufferSend(HIF_DEVICE *device, | |||
781 | return status; | 781 | return status; |
782 | } | 782 | } |
783 | 783 | ||
784 | A_STATUS | 784 | int |
785 | bmiBufferReceive(HIF_DEVICE *device, | 785 | bmiBufferReceive(HIF_DEVICE *device, |
786 | A_UCHAR *buffer, | 786 | A_UCHAR *buffer, |
787 | A_UINT32 length, | 787 | A_UINT32 length, |
788 | A_BOOL want_timeout) | 788 | A_BOOL want_timeout) |
789 | { | 789 | { |
790 | A_STATUS status; | 790 | int status; |
791 | A_UINT32 address; | 791 | A_UINT32 address; |
792 | A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX]; | 792 | A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX]; |
793 | HIF_PENDING_EVENTS_INFO hifPendingEvents; | 793 | HIF_PENDING_EVENTS_INFO hifPendingEvents; |
@@ -957,10 +957,10 @@ bmiBufferReceive(HIF_DEVICE *device, | |||
957 | return A_OK; | 957 | return A_OK; |
958 | } | 958 | } |
959 | 959 | ||
960 | A_STATUS | 960 | int |
961 | BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32 length) | 961 | BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32 length) |
962 | { | 962 | { |
963 | A_STATUS status = A_ERROR; | 963 | int status = A_ERROR; |
964 | A_UINT32 lastWord = 0; | 964 | A_UINT32 lastWord = 0; |
965 | A_UINT32 lastWordOffset = length & ~0x3; | 965 | A_UINT32 lastWordOffset = length & ~0x3; |
966 | A_UINT32 unalignedBytes = length & 0x3; | 966 | A_UINT32 unalignedBytes = length & 0x3; |
@@ -997,13 +997,13 @@ BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32 | |||
997 | return status; | 997 | return status; |
998 | } | 998 | } |
999 | 999 | ||
1000 | A_STATUS | 1000 | int |
1001 | BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length) | 1001 | BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length) |
1002 | { | 1002 | { |
1003 | return bmiBufferSend(device, buffer, length); | 1003 | return bmiBufferSend(device, buffer, length); |
1004 | } | 1004 | } |
1005 | 1005 | ||
1006 | A_STATUS | 1006 | int |
1007 | BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length, A_BOOL want_timeout) | 1007 | BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length, A_BOOL want_timeout) |
1008 | { | 1008 | { |
1009 | return bmiBufferReceive(device, buffer, length, want_timeout); | 1009 | return bmiBufferReceive(device, buffer, length, want_timeout); |