Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 235784
b: refs/heads/master
c: a1d4652
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Feb 2, 2011
1 parent 084be36 commit c04c53e
Show file tree
Hide file tree
Showing 13 changed files with 88 additions and 88 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f68057e6fab6943ea2c5867d8b72e4b08bef5f6e
refs/heads/master: a1d46529630cbe1072b7b7b1a0104655b47cd7de
52 changes: 26 additions & 26 deletions trunk/drivers/staging/ath6kl/bmi/src/bmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ BMIDone(HIF_DEVICE *device)
cid = BMI_DONE;

status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -156,14 +156,14 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
cid = BMI_GET_TARGET_INFO;

status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}

status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_ver,
sizeof(targ_info->target_ver), true);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Version from the device\n"));
return A_ERROR;
}
Expand All @@ -172,7 +172,7 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
/* Determine how many bytes are in the Target's targ_info */
status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_info_byte_count,
sizeof(targ_info->target_info_byte_count), true);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info Byte Count from the device\n"));
return A_ERROR;
}
Expand All @@ -187,7 +187,7 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
status = bmiBufferReceive(device,
((A_UCHAR *)targ_info)+sizeof(targ_info->target_info_byte_count),
sizeof(*targ_info)-sizeof(targ_info->target_info_byte_count), true);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info (%d bytes) from the device\n",
targ_info->target_info_byte_count));
return A_ERROR;
Expand Down Expand Up @@ -239,12 +239,12 @@ BMIReadMemory(HIF_DEVICE *device,
offset += sizeof(length);

status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}
status = bmiBufferReceive(device, pBMICmdBuf, rxlen, true);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -309,7 +309,7 @@ BMIWriteMemory(HIF_DEVICE *device,
A_MEMCPY(&(pBMICmdBuf[offset]), src, txlen);
offset += txlen;
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -352,13 +352,13 @@ BMIExecute(HIF_DEVICE *device,
A_MEMCPY(&(pBMICmdBuf[offset]), param, sizeof(*param));
offset += sizeof(*param);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}

status = bmiBufferReceive(device, pBMICmdBuf, sizeof(*param), false);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -397,7 +397,7 @@ BMISetAppStart(HIF_DEVICE *device,
A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));
offset += sizeof(address);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -436,13 +436,13 @@ BMIReadSOCRegister(HIF_DEVICE *device,
offset += sizeof(address);

status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}

status = bmiBufferReceive(device, pBMICmdBuf, sizeof(*param), true);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -483,7 +483,7 @@ BMIWriteSOCRegister(HIF_DEVICE *device,
A_MEMCPY(&(pBMICmdBuf[offset]), &param, sizeof(param));
offset += sizeof(param);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -532,13 +532,13 @@ BMIrompatchInstall(HIF_DEVICE *device,
A_MEMCPY(&(pBMICmdBuf[offset]), &do_activate, sizeof(do_activate));
offset += sizeof(do_activate);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}

status = bmiBufferReceive(device, pBMICmdBuf, sizeof(*rompatch_id), true);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -576,7 +576,7 @@ BMIrompatchUninstall(HIF_DEVICE *device,
A_MEMCPY(&(pBMICmdBuf[offset]), &rompatch_id, sizeof(rompatch_id));
offset += sizeof(rompatch_id);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -619,7 +619,7 @@ _BMIrompatchChangeActivation(HIF_DEVICE *device,
A_MEMCPY(&(pBMICmdBuf[offset]), rompatch_list, length);
offset += length;
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -683,7 +683,7 @@ BMILZData(HIF_DEVICE *device,
A_MEMCPY(&(pBMICmdBuf[offset]), &buffer[length - remaining], txlen);
offset += txlen;
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -722,7 +722,7 @@ BMILZStreamStart(HIF_DEVICE *device,
A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));
offset += sizeof(address);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to Start LZ Stream to the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -757,7 +757,7 @@ bmiBufferSend(HIF_DEVICE *device,
* make all HIF accesses 4-byte aligned */
status = HIFReadWrite(device, address, (u8 *)pBMICmdCredits, 4,
HIF_RD_SYNC_BYTE_INC, NULL);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to decrement the command credit count register\n"));
return A_ERROR;
}
Expand All @@ -769,7 +769,7 @@ bmiBufferSend(HIF_DEVICE *device,
address = mboxAddress[ENDPOINT1];
status = HIFReadWrite(device, address, buffer, length,
HIF_WR_SYNC_BYTE_INC, NULL);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to send the BMI data to the device\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -868,7 +868,7 @@ bmiBufferReceive(HIF_DEVICE *device,
status = getPendingEventsFunc(device,
&hifPendingEvents,
NULL);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMI: Failed to get pending events \n"));
break;
}
Expand All @@ -881,7 +881,7 @@ bmiBufferReceive(HIF_DEVICE *device,

status = HIFReadWrite(device, RX_LOOKAHEAD_VALID_ADDRESS, (u8 *)&word_available,
sizeof(word_available), HIF_RD_SYNC_BYTE_INC, NULL);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read RX_LOOKAHEAD_VALID register\n"));
return A_ERROR;
}
Expand Down Expand Up @@ -932,7 +932,7 @@ bmiBufferReceive(HIF_DEVICE *device,
* The rationale here is to make all HIF accesses a multiple of 4 bytes */
status = HIFReadWrite(device, address, (u8 *)pBMICmdCredits, sizeof(*pBMICmdCredits),
HIF_RD_SYNC_BYTE_FIX, NULL);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read the command credit count register\n"));
return A_ERROR;
}
Expand All @@ -949,7 +949,7 @@ bmiBufferReceive(HIF_DEVICE *device,

address = mboxAddress[ENDPOINT1];
status = HIFReadWrite(device, address, buffer, length, HIF_RD_SYNC_BYTE_INC, NULL);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read the BMI data from the device\n"));
return A_ERROR;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@ static int hifDeviceSuspend(struct device *dev)
if (device && device->claimedContext && osdrvCallbacks.deviceSuspendHandler) {
device->is_suspend = true; /* set true first for PowerStateChangeNotify(..) */
status = osdrvCallbacks.deviceSuspendHandler(device->claimedContext);
if (status != A_OK) {
if (status) {
device->is_suspend = false;
}
}
Expand Down
36 changes: 18 additions & 18 deletions trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ int DevSetup(AR6K_DEVICE *pDev)
status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_ADDR,
&pDev->MailBoxInfo, sizeof(pDev->MailBoxInfo));

if (status != A_OK) {
if (status) {
A_ASSERT(false);
break;
}
Expand All @@ -127,7 +127,7 @@ int DevSetup(AR6K_DEVICE *pDev)
status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
blocksizes, sizeof(blocksizes));

if (status != A_OK) {
if (status) {
A_ASSERT(false);
break;
}
Expand Down Expand Up @@ -266,7 +266,7 @@ int DevEnableInterrupts(AR6K_DEVICE *pDev)
HIF_WR_SYNC_BYTE_INC,
NULL);

if (status != A_OK) {
if (status) {
/* Can't write it for some reason */
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
("Failed to update interrupt control registers err: %d\n", status));
Expand Down Expand Up @@ -510,7 +510,7 @@ int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPendin
sizeof(A_UCHAR),
HIF_RD_SYNC_BYTE_INC,
NULL);
if(status)
if (status)
{
AR_DEBUG_PRINTF(ATH_LOG_ERR,("DevWaitForPendingRecv:Read HOST_INT_STATUS_ADDRESS Failed 0x%X\n",status));
break;
Expand Down Expand Up @@ -1156,7 +1156,7 @@ static int SendBuffers(AR6K_DEVICE *pDev, int mbox)
paddedLength,
request,
NULL);
if (status != A_OK) {
if (status) {
break;
}
totalBytes += sendList[i].length;
Expand All @@ -1182,7 +1182,7 @@ static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits)
address = COUNT_DEC_ADDRESS + (AR6K_MAILBOXES + mbox) * 4;
status = HIFReadWrite(pDev->HIFDevice, address, &credits, sizeof(credits),
HIF_RD_SYNC_BYTE_FIX, NULL);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
("Unable to decrement the command credit count register (mbox=%d)\n",mbox));
status = A_ERROR;
Expand Down Expand Up @@ -1244,7 +1244,7 @@ static int RecvBuffers(AR6K_DEVICE *pDev, int mbox)
* until we get at least 1 credit or it times out */
status = GetCredits(pDev, mbox, &credits);

if (status != A_OK) {
if (status) {
break;
}

Expand All @@ -1264,7 +1264,7 @@ static int RecvBuffers(AR6K_DEVICE *pDev, int mbox)
paddedLength,
request,
NULL);
if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to read %d bytes on mailbox:%d : address:0x%X \n",
recvList[curBuffer].length, mbox, g_MailboxAddrs[mbox]));
break;
Expand All @@ -1275,7 +1275,7 @@ static int RecvBuffers(AR6K_DEVICE *pDev, int mbox)
curBuffer++;
}

if (status != A_OK) {
if (status) {
break;
}
/* go back and get some more */
Expand All @@ -1302,15 +1302,15 @@ static int DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox)
/* send out buffers */
status = SendBuffers(pDev,mbox);

if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Sending buffers Failed : %d mbox:%d\n",status,mbox));
break;
}

/* go get them, this will block */
status = RecvBuffers(pDev, mbox);

if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Recv buffers Failed : %d mbox:%d\n",status,mbox));
break;
}
Expand Down Expand Up @@ -1348,7 +1348,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_ADDR,
g_MailboxAddrs, sizeof(g_MailboxAddrs));

if (status != A_OK) {
if (status) {
A_ASSERT(false);
break;
}
Expand All @@ -1357,7 +1357,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
g_BlockSizes, sizeof(g_BlockSizes));

if (status != A_OK) {
if (status) {
A_ASSERT(false);
break;
}
Expand All @@ -1380,7 +1380,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
* mailbox 0 */
status = GetCredits(pDev, 0, &credits);

if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to wait for target ready \n"));
break;
}
Expand All @@ -1395,7 +1395,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
HIF_RD_SYNC_BYTE_INC,
NULL);

if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to wait get parameters \n"));
break;
}
Expand Down Expand Up @@ -1423,7 +1423,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
HIF_WR_SYNC_BYTE_INC,
NULL);

if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to write end marker \n"));
break;
}
Expand All @@ -1440,7 +1440,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
HIF_WR_SYNC_BYTE_INC,
NULL);

if (status != A_OK) {
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to write block mask \n"));
break;
}
Expand All @@ -1450,7 +1450,7 @@ int DoMboxHWTest(AR6K_DEVICE *pDev)
/* execute the test on each mailbox */
for (i = 0; i < AR6K_MAILBOXES; i++) {
status = DoOneMboxHWTest(pDev, i);
if (status != A_OK) {
if (status) {
break;
}
}
Expand Down
Loading

0 comments on commit c04c53e

Please sign in to comment.