Skip to content

Commit

Permalink
staging: ath6kl: Convert enum A_STATUS to int
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Jan 31, 2011
1 parent a789325 commit 1f4c34b
Show file tree
Hide file tree
Showing 55 changed files with 1,055 additions and 1,052 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/ath6kl/bmi/include/bmi_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
/* ------ Global Variable Declarations ------- */
static A_BOOL bmiDone;

A_STATUS
int
bmiBufferSend(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length);

A_STATUS
int
bmiBufferReceive(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length,
Expand Down
72 changes: 36 additions & 36 deletions drivers/staging/ath6kl/bmi/src/bmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ BMICleanup(void)
}
}

A_STATUS
int
BMIDone(HIF_DEVICE *device)
{
A_STATUS status;
int status;
A_UINT32 cid;

if (bmiDone) {
Expand Down Expand Up @@ -141,10 +141,10 @@ BMIDone(HIF_DEVICE *device)
return A_OK;
}

A_STATUS
int
BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
{
A_STATUS status;
int status;
A_UINT32 cid;

if (bmiDone) {
Expand Down Expand Up @@ -200,14 +200,14 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
return A_OK;
}

A_STATUS
int
BMIReadMemory(HIF_DEVICE *device,
A_UINT32 address,
A_UCHAR *buffer,
A_UINT32 length)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;
A_UINT32 remaining, rxlen;

Expand Down Expand Up @@ -256,14 +256,14 @@ BMIReadMemory(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMIWriteMemory(HIF_DEVICE *device,
A_UINT32 address,
A_UCHAR *buffer,
A_UINT32 length)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;
A_UINT32 remaining, txlen;
const A_UINT32 header = sizeof(cid) + sizeof(address) + sizeof(length);
Expand Down Expand Up @@ -321,13 +321,13 @@ BMIWriteMemory(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMIExecute(HIF_DEVICE *device,
A_UINT32 address,
A_UINT32 *param)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param)));
Expand Down Expand Up @@ -369,12 +369,12 @@ BMIExecute(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMISetAppStart(HIF_DEVICE *device,
A_UINT32 address)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
Expand Down Expand Up @@ -406,13 +406,13 @@ BMISetAppStart(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMIReadSOCRegister(HIF_DEVICE *device,
A_UINT32 address,
A_UINT32 *param)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
Expand Down Expand Up @@ -452,13 +452,13 @@ BMIReadSOCRegister(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMIWriteSOCRegister(HIF_DEVICE *device,
A_UINT32 address,
A_UINT32 param)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param)));
Expand Down Expand Up @@ -492,7 +492,7 @@ BMIWriteSOCRegister(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMIrompatchInstall(HIF_DEVICE *device,
A_UINT32 ROM_addr,
A_UINT32 RAM_addr,
Expand All @@ -501,7 +501,7 @@ BMIrompatchInstall(HIF_DEVICE *device,
A_UINT32 *rompatch_id)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) +
Expand Down Expand Up @@ -548,12 +548,12 @@ BMIrompatchInstall(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMIrompatchUninstall(HIF_DEVICE *device,
A_UINT32 rompatch_id)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(rompatch_id)));
Expand Down Expand Up @@ -585,14 +585,14 @@ BMIrompatchUninstall(HIF_DEVICE *device,
return A_OK;
}

static A_STATUS
static int
_BMIrompatchChangeActivation(HIF_DEVICE *device,
A_UINT32 rompatch_count,
A_UINT32 *rompatch_list,
A_UINT32 do_activate)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;
A_UINT32 length;

Expand Down Expand Up @@ -629,29 +629,29 @@ _BMIrompatchChangeActivation(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMIrompatchActivate(HIF_DEVICE *device,
A_UINT32 rompatch_count,
A_UINT32 *rompatch_list)
{
return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 1);
}

A_STATUS
int
BMIrompatchDeactivate(HIF_DEVICE *device,
A_UINT32 rompatch_count,
A_UINT32 *rompatch_list)
{
return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 0);
}

A_STATUS
int
BMILZData(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;
A_UINT32 remaining, txlen;
const A_UINT32 header = sizeof(cid) + sizeof(length);
Expand Down Expand Up @@ -695,12 +695,12 @@ BMILZData(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMILZStreamStart(HIF_DEVICE *device,
A_UINT32 address)
{
A_UINT32 cid;
A_STATUS status;
int status;
A_UINT32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
Expand Down Expand Up @@ -733,12 +733,12 @@ BMILZStreamStart(HIF_DEVICE *device,
}

/* BMI Access routines */
A_STATUS
int
bmiBufferSend(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length)
{
A_STATUS status;
int status;
A_UINT32 timeout;
A_UINT32 address;
A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
Expand Down Expand Up @@ -781,13 +781,13 @@ bmiBufferSend(HIF_DEVICE *device,
return status;
}

A_STATUS
int
bmiBufferReceive(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length,
A_BOOL want_timeout)
{
A_STATUS status;
int status;
A_UINT32 address;
A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
HIF_PENDING_EVENTS_INFO hifPendingEvents;
Expand Down Expand Up @@ -957,10 +957,10 @@ bmiBufferReceive(HIF_DEVICE *device,
return A_OK;
}

A_STATUS
int
BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32 length)
{
A_STATUS status = A_ERROR;
int status = A_ERROR;
A_UINT32 lastWord = 0;
A_UINT32 lastWordOffset = length & ~0x3;
A_UINT32 unalignedBytes = length & 0x3;
Expand Down Expand Up @@ -997,13 +997,13 @@ BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32
return status;
}

A_STATUS
int
BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length)
{
return bmiBufferSend(device, buffer, length);
}

A_STATUS
int
BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length, A_BOOL want_timeout)
{
return bmiBufferReceive(device, buffer, length, want_timeout);
Expand Down
10 changes: 5 additions & 5 deletions drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ typedef struct bus_request {
A_UINT32 length;
A_UINT32 request;
void *context;
A_STATUS status;
int status;
struct _HIF_SCATTER_REQ_PRIV *pScatterReq; /* this request is a scatter request */
} BUS_REQUEST;

Expand Down Expand Up @@ -110,18 +110,18 @@ typedef struct _HIF_SCATTER_REQ_PRIV {

#define ATH_DEBUG_SCATTER ATH_DEBUG_MAKE_MODULE_MASK(0)

A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo);
int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo);
void CleanupHIFScatterResources(HIF_DEVICE *device);
A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest);
int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest);

#else // HIF_LINUX_MMC_SCATTER_SUPPORT

static inline A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo)
static inline int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo)
{
return A_ENOTSUP;
}

static inline A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
static inline int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
{
return A_ENOTSUP;
}
Expand Down
Loading

0 comments on commit 1f4c34b

Please sign in to comment.