summaryrefslogtreecommitdiffstats
path: root/drivers/staging/ath6kl/hif/sdio/linux_sdio
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-01-27 20:04:19 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-31 13:53:11 -0800
commit1f4c34bded914e81b4388ccfdfab8a31da5ab0c3 (patch)
tree17143db6180c0e30c4634f69d67e67d761fc37e1 /drivers/staging/ath6kl/hif/sdio/linux_sdio
parenta789325dc3aa89bb5001d26b542d7abc775b46f1 (diff)
downloadop-kernel-dev-1f4c34bded914e81b4388ccfdfab8a31da5ab0c3.zip
op-kernel-dev-1f4c34bded914e81b4388ccfdfab8a31da5ab0c3.tar.gz
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/sdio/linux_sdio')
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h10
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c46
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c12
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 857f35f..f72ba6c 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 {
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;
@@ -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;
}
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 e96662b..61166a5 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;
extern A_UINT32 debughif;
static void ResetAllCards(void);
-static A_STATUS hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func);
-static A_STATUS hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func);
+static int hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func);
+static int hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func);
#ifdef DEBUG
@@ -123,7 +123,7 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(hif,
/* ------ Functions ------ */
-A_STATUS HIFInit(OSDRV_CALLBACKS *callbacks)
+int HIFInit(OSDRV_CALLBACKS *callbacks)
{
int status;
AR_DEBUG_ASSERT(callbacks != NULL);
@@ -152,7 +152,7 @@ A_STATUS HIFInit(OSDRV_CALLBACKS *callbacks)
}
-static A_STATUS
+static int
__HIFReadWrite(HIF_DEVICE *device,
A_UINT32 address,
A_UCHAR *buffer,
@@ -161,7 +161,7 @@ __HIFReadWrite(HIF_DEVICE *device,
void *context)
{
A_UINT8 opcode;
- A_STATUS status = A_OK;
+ int status = A_OK;
int ret;
A_UINT8 *tbuffer;
A_BOOL bounced = FALSE;
@@ -329,7 +329,7 @@ void AddToAsyncList(HIF_DEVICE *device, BUS_REQUEST *busrequest)
/* queue a read/write request */
-A_STATUS
+int
HIFReadWrite(HIF_DEVICE *device,
A_UINT32 address,
A_UCHAR *buffer,
@@ -337,7 +337,7 @@ HIFReadWrite(HIF_DEVICE *device,
A_UINT32 request,
void *context)
{
- A_STATUS status = A_OK;
+ int status = A_OK;
BUS_REQUEST *busrequest;
@@ -375,7 +375,7 @@ HIFReadWrite(HIF_DEVICE *device,
/* interrupted, exit */
return A_ERROR;
} else {
- A_STATUS status = busrequest->status;
+ int status = busrequest->status;
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: sync return freeing 0x%lX: 0x%X\n",
(unsigned long)busrequest, busrequest->status));
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)
{
HIF_DEVICE *device;
BUS_REQUEST *request;
- A_STATUS status;
+ int status;
unsigned long flags;
device = (HIF_DEVICE *)param;
@@ -488,7 +488,7 @@ static A_INT32 IssueSDCommand(HIF_DEVICE *device, A_UINT32 opcode, A_UINT32 arg,
return err;
}
-A_STATUS ReinitSDIO(HIF_DEVICE *device)
+int ReinitSDIO(HIF_DEVICE *device)
{
A_INT32 err;
struct mmc_host *host;
@@ -647,10 +647,10 @@ A_STATUS ReinitSDIO(HIF_DEVICE *device)
return (err) ? A_ERROR : A_OK;
}
-A_STATUS
+int
PowerStateChangeNotify(HIF_DEVICE *device, HIF_DEVICE_POWER_CHANGE_TYPE config)
{
- A_STATUS status = A_OK;
+ int status = A_OK;
#if defined(CONFIG_PM)
struct sdio_func *func = device->func;
int old_reset_val;
@@ -690,12 +690,12 @@ PowerStateChangeNotify(HIF_DEVICE *device, HIF_DEVICE_POWER_CHANGE_TYPE config)
return status;
}
-A_STATUS
+int
HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
void *config, A_UINT32 configLen)
{
A_UINT32 count;
- A_STATUS status = A_OK;
+ int status = A_OK;
switch(opcode) {
case HIF_DEVICE_GET_MBOX_BLOCK_SIZE:
@@ -774,7 +774,7 @@ HIFShutDownDevice(HIF_DEVICE *device)
static void
hifIRQHandler(struct sdio_func *func)
{
- A_STATUS status;
+ int status;
HIF_DEVICE *device;
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifIRQHandler\n"));
@@ -949,10 +949,10 @@ hifFreeBusRequest(HIF_DEVICE *device, BUS_REQUEST *busrequest)
spin_unlock_irqrestore(&device->lock, flag);
}
-static A_STATUS hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func)
+static int hifDisableFunc(HIF_DEVICE *device, struct sdio_func *func)
{
int ret;
- A_STATUS status = A_OK;
+ int status = A_OK;
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifDisableFunc\n"));
device = getHifDevice(func);
@@ -1080,7 +1080,7 @@ static int hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func)
static int hifDeviceSuspend(struct device *dev)
{
struct sdio_func *func=dev_to_sdio_func(dev);
- A_STATUS status = A_OK;
+ int status = A_OK;
HIF_DEVICE *device;
device = getHifDevice(func);
@@ -1107,7 +1107,7 @@ static int hifDeviceSuspend(struct device *dev)
static int hifDeviceResume(struct device *dev)
{
struct sdio_func *func=dev_to_sdio_func(dev);
- A_STATUS status = A_OK;
+ int status = A_OK;
HIF_DEVICE *device;
device = getHifDevice(func);
@@ -1126,7 +1126,7 @@ static int hifDeviceResume(struct device *dev)
static void hifDeviceRemoved(struct sdio_func *func)
{
- A_STATUS status = A_OK;
+ int status = A_OK;
HIF_DEVICE *device;
AR_DEBUG_ASSERT(func != NULL);
@@ -1151,11 +1151,11 @@ static void hifDeviceRemoved(struct sdio_func *func)
/*
* This should be moved to AR6K HTC layer.
*/
-A_STATUS hifWaitForPendingRecv(HIF_DEVICE *device)
+int hifWaitForPendingRecv(HIF_DEVICE *device)
{
A_INT32 cnt = 10;
A_UINT8 host_int_status;
- A_STATUS status = A_OK;
+ int status = A_OK;
do {
while (atomic_read(&device->irqHandling)) {
@@ -1233,7 +1233,7 @@ void HIFReleaseDevice(HIF_DEVICE *device)
device->claimedContext = NULL;
}
-A_STATUS HIFAttachHTC(HIF_DEVICE *device, HTC_CALLBACKS *callbacks)
+int HIFAttachHTC(HIF_DEVICE *device, HTC_CALLBACKS *callbacks)
{
if (device->htcCallbacks.context != NULL) {
/* 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 ee8b477..ceeced4 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)
}
/* called by async task to perform the operation synchronously using direct MMC APIs */
-A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
+int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
{
int i;
A_UINT8 rw;
@@ -89,7 +89,7 @@ A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
struct mmc_data data;
HIF_SCATTER_REQ_PRIV *pReqPriv;
HIF_SCATTER_REQ *pReq;
- A_STATUS status = A_OK;
+ int status = A_OK;
struct scatterlist *pSg;
pReqPriv = busrequest->pScatterReq;
@@ -199,9 +199,9 @@ A_STATUS DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest)
}
/* callback to issue a read-write scatter request */
-static A_STATUS HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
+static int HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
{
- A_STATUS status = A_EINVAL;
+ int status = A_EINVAL;
A_UINT32 request = pReq->Request;
HIF_SCATTER_REQ_PRIV *pReqPriv = (HIF_SCATTER_REQ_PRIV *)pReq->HIFPrivate[0];
@@ -275,9 +275,9 @@ static A_STATUS HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
}
/* setup of HIF scatter resources */
-A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo)
+int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo)
{
- A_STATUS status = A_ERROR;
+ int status = A_ERROR;
int i;
HIF_SCATTER_REQ_PRIV *pReqPriv;
BUS_REQUEST *busrequest;
OpenPOWER on IntegriCloud