diff options
author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2011-03-30 21:57:33 -0400 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2011-03-31 10:26:23 -0400 |
commit | 25985edcedea6396277003854657b5f3cb31a628 (patch) | |
tree | f026e810210a2ee7290caeb737c23cb6472b7c38 /drivers/staging | |
parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) |
Fix common misspellings
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Diffstat (limited to 'drivers/staging')
317 files changed, 759 insertions, 759 deletions
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c index c6488e0d1305..41223f953589 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | |||
@@ -237,7 +237,7 @@ static int CreditsAvailableCallback(void *pContext, int Credits, bool CreditIRQE | |||
237 | pProt->CreditsCurrentSeek)); | 237 | pProt->CreditsCurrentSeek)); |
238 | 238 | ||
239 | if (pProt->CreditsAvailable >= pProt->CreditsCurrentSeek) { | 239 | if (pProt->CreditsAvailable >= pProt->CreditsCurrentSeek) { |
240 | /* we have enough credits to fullfill at least 1 packet waiting in the queue */ | 240 | /* we have enough credits to fulfill at least 1 packet waiting in the queue */ |
241 | pProt->CreditsCurrentSeek = 0; | 241 | pProt->CreditsCurrentSeek = 0; |
242 | pProt->SendStateFlags &= ~HCI_SEND_WAIT_CREDITS; | 242 | pProt->SendStateFlags &= ~HCI_SEND_WAIT_CREDITS; |
243 | doPendingSends = true; | 243 | doPendingSends = true; |
@@ -285,7 +285,7 @@ static void FailureCallback(void *pContext, int Status) | |||
285 | { | 285 | { |
286 | struct gmbox_proto_hci_uart *pProt = (struct gmbox_proto_hci_uart *)pContext; | 286 | struct gmbox_proto_hci_uart *pProt = (struct gmbox_proto_hci_uart *)pContext; |
287 | 287 | ||
288 | /* target assertion occured */ | 288 | /* target assertion occurred */ |
289 | NotifyTransportFailure(pProt, Status); | 289 | NotifyTransportFailure(pProt, Status); |
290 | } | 290 | } |
291 | 291 | ||
@@ -507,7 +507,7 @@ static int HCIUartMessagePending(void *pContext, u8 LookAheadBytes[], int ValidB | |||
507 | 507 | ||
508 | } while (false); | 508 | } while (false); |
509 | 509 | ||
510 | /* check if we need to disable the reciever */ | 510 | /* check if we need to disable the receiver */ |
511 | if (status || blockRecv) { | 511 | if (status || blockRecv) { |
512 | DevGMboxIRQAction(pProt->pDev, GMBOX_RECV_IRQ_DISABLE, PROC_IO_SYNC); | 512 | DevGMboxIRQAction(pProt->pDev, GMBOX_RECV_IRQ_DISABLE, PROC_IO_SYNC); |
513 | } | 513 | } |
diff --git a/drivers/staging/ath6kl/include/aggr_recv_api.h b/drivers/staging/ath6kl/include/aggr_recv_api.h index 67a058492c4d..5ead58d5febd 100644 --- a/drivers/staging/ath6kl/include/aggr_recv_api.h +++ b/drivers/staging/ath6kl/include/aggr_recv_api.h | |||
@@ -72,7 +72,7 @@ aggr_process_bar(void *cntxt, u8 tid, u16 seq_no); | |||
72 | * This event is to initiate/modify the receive side window. | 72 | * This event is to initiate/modify the receive side window. |
73 | * Target will send WMI_ADDBA_REQ_EVENTID event to host - to setup | 73 | * Target will send WMI_ADDBA_REQ_EVENTID event to host - to setup |
74 | * recv re-ordering queues. Target will negotiate ADDBA with peer, | 74 | * recv re-ordering queues. Target will negotiate ADDBA with peer, |
75 | * and indicate via this event after succesfully completing the | 75 | * and indicate via this event after successfully completing the |
76 | * negotiation. This happens in two situations: | 76 | * negotiation. This happens in two situations: |
77 | * 1. Initial setup of aggregation | 77 | * 1. Initial setup of aggregation |
78 | * 2. Renegotiation of current recv window. | 78 | * 2. Renegotiation of current recv window. |
diff --git a/drivers/staging/ath6kl/include/common/a_hci.h b/drivers/staging/ath6kl/include/common/a_hci.h index 08cb013090be..379d65224e3a 100644 --- a/drivers/staging/ath6kl/include/common/a_hci.h +++ b/drivers/staging/ath6kl/include/common/a_hci.h | |||
@@ -124,7 +124,7 @@ | |||
124 | #define PAL_NUM_COMPL_DATA_BLOCK_EVENT 0x48 | 124 | #define PAL_NUM_COMPL_DATA_BLOCK_EVENT 0x48 |
125 | #define PAL_SHORT_RANGE_MODE_CHANGE_COMPL_EVENT 0x4C | 125 | #define PAL_SHORT_RANGE_MODE_CHANGE_COMPL_EVENT 0x4C |
126 | #define PAL_AMP_STATUS_CHANGE_EVENT 0x4D | 126 | #define PAL_AMP_STATUS_CHANGE_EVENT 0x4D |
127 | /*======== End of PAL events definiton =================*/ | 127 | /*======== End of PAL events definition =================*/ |
128 | 128 | ||
129 | 129 | ||
130 | /*======== Timeouts (not part of HCI cmd, but input to PAL engine) =========*/ | 130 | /*======== Timeouts (not part of HCI cmd, but input to PAL engine) =========*/ |
@@ -430,7 +430,7 @@ typedef struct hci_event_hw_err_t { | |||
430 | u8 hw_err_code; | 430 | u8 hw_err_code; |
431 | } POSTPACK HCI_EVENT_HW_ERR; | 431 | } POSTPACK HCI_EVENT_HW_ERR; |
432 | 432 | ||
433 | /* Flush occured event */ | 433 | /* Flush occurred event */ |
434 | /* Qos Violation event */ | 434 | /* Qos Violation event */ |
435 | typedef struct hci_event_handle_t { | 435 | typedef struct hci_event_handle_t { |
436 | u8 event_code; | 436 | u8 event_code; |
diff --git a/drivers/staging/ath6kl/include/common/dbglog.h b/drivers/staging/ath6kl/include/common/dbglog.h index 3a3d00da0b81..b7a123086ccf 100644 --- a/drivers/staging/ath6kl/include/common/dbglog.h +++ b/drivers/staging/ath6kl/include/common/dbglog.h | |||
@@ -44,7 +44,7 @@ extern "C" { | |||
44 | #define DBGLOG_MODULEID_NUM_MAX 16 /* Upper limit is width of mask */ | 44 | #define DBGLOG_MODULEID_NUM_MAX 16 /* Upper limit is width of mask */ |
45 | 45 | ||
46 | /* | 46 | /* |
47 | * Please ensure that the definition of any new module intrduced is captured | 47 | * Please ensure that the definition of any new module introduced is captured |
48 | * between the DBGLOG_MODULEID_START and DBGLOG_MODULEID_END defines. The | 48 | * between the DBGLOG_MODULEID_START and DBGLOG_MODULEID_END defines. The |
49 | * structure is required for the parser to correctly pick up the values for | 49 | * structure is required for the parser to correctly pick up the values for |
50 | * different modules. | 50 | * different modules. |
diff --git a/drivers/staging/ath6kl/include/common/epping_test.h b/drivers/staging/ath6kl/include/common/epping_test.h index 5c40d8a2229d..7027fac8f37e 100644 --- a/drivers/staging/ath6kl/include/common/epping_test.h +++ b/drivers/staging/ath6kl/include/common/epping_test.h | |||
@@ -92,7 +92,7 @@ typedef PREPACK struct { | |||
92 | #define EPPING_CMD_RESET_RECV_CNT 2 /* reset recv count */ | 92 | #define EPPING_CMD_RESET_RECV_CNT 2 /* reset recv count */ |
93 | #define EPPING_CMD_CAPTURE_RECV_CNT 3 /* fetch recv count, 4-byte count returned in CmdBuffer_t */ | 93 | #define EPPING_CMD_CAPTURE_RECV_CNT 3 /* fetch recv count, 4-byte count returned in CmdBuffer_t */ |
94 | #define EPPING_CMD_NO_ECHO 4 /* non-echo packet test (tx-only) */ | 94 | #define EPPING_CMD_NO_ECHO 4 /* non-echo packet test (tx-only) */ |
95 | #define EPPING_CMD_CONT_RX_START 5 /* continous RX packets, parameters are in CmdBuffer_h */ | 95 | #define EPPING_CMD_CONT_RX_START 5 /* continuous RX packets, parameters are in CmdBuffer_h */ |
96 | #define EPPING_CMD_CONT_RX_STOP 6 /* stop continuous RX packet transmission */ | 96 | #define EPPING_CMD_CONT_RX_STOP 6 /* stop continuous RX packet transmission */ |
97 | 97 | ||
98 | /* test command parameters may be no more than 8 bytes */ | 98 | /* test command parameters may be no more than 8 bytes */ |
diff --git a/drivers/staging/ath6kl/include/common/ini_dset.h b/drivers/staging/ath6kl/include/common/ini_dset.h index 8bfc75940c8f..a9e05fa0f659 100644 --- a/drivers/staging/ath6kl/include/common/ini_dset.h +++ b/drivers/staging/ath6kl/include/common/ini_dset.h | |||
@@ -31,7 +31,7 @@ | |||
31 | */ | 31 | */ |
32 | typedef enum { | 32 | typedef enum { |
33 | #if defined(AR6002_REV4) || defined(AR6003) | 33 | #if defined(AR6002_REV4) || defined(AR6003) |
34 | /* Add these definitions for compatability */ | 34 | /* Add these definitions for compatibility */ |
35 | #define WHAL_INI_DATA_ID_BB_RFGAIN_LNA1 WHAL_INI_DATA_ID_BB_RFGAIN | 35 | #define WHAL_INI_DATA_ID_BB_RFGAIN_LNA1 WHAL_INI_DATA_ID_BB_RFGAIN |
36 | #define WHAL_INI_DATA_ID_BB_RFGAIN_LNA2 WHAL_INI_DATA_ID_BB_RFGAIN | 36 | #define WHAL_INI_DATA_ID_BB_RFGAIN_LNA2 WHAL_INI_DATA_ID_BB_RFGAIN |
37 | WHAL_INI_DATA_ID_NULL =0, | 37 | WHAL_INI_DATA_ID_NULL =0, |
diff --git a/drivers/staging/ath6kl/include/common/testcmd.h b/drivers/staging/ath6kl/include/common/testcmd.h index 9ca1f2ac2cbf..7d94aee508b3 100644 --- a/drivers/staging/ath6kl/include/common/testcmd.h +++ b/drivers/staging/ath6kl/include/common/testcmd.h | |||
@@ -43,8 +43,8 @@ typedef enum { | |||
43 | PN15_PATTERN | 43 | PN15_PATTERN |
44 | }TX_DATA_PATTERN; | 44 | }TX_DATA_PATTERN; |
45 | 45 | ||
46 | /* Continous tx | 46 | /* Continuous tx |
47 | mode : TCMD_CONT_TX_OFF - Disabling continous tx | 47 | mode : TCMD_CONT_TX_OFF - Disabling continuous tx |
48 | TCMD_CONT_TX_SINE - Enable continuous unmodulated tx | 48 | TCMD_CONT_TX_SINE - Enable continuous unmodulated tx |
49 | TCMD_CONT_TX_FRAME- Enable continuous modulated tx | 49 | TCMD_CONT_TX_FRAME- Enable continuous modulated tx |
50 | freq : Channel freq in Mhz. (e.g 2412 for channel 1 in 11 g) | 50 | freq : Channel freq in Mhz. (e.g 2412 for channel 1 in 11 g) |
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h index c645af373442..4e6343485362 100644 --- a/drivers/staging/ath6kl/include/common/wmi.h +++ b/drivers/staging/ath6kl/include/common/wmi.h | |||
@@ -1568,8 +1568,8 @@ typedef PREPACK struct { | |||
1568 | switch to ps-poll mode | 1568 | switch to ps-poll mode |
1569 | default = 3 */ | 1569 | default = 3 */ |
1570 | 1570 | ||
1571 | u32 scoContStompMax; /* max number of continous stomp allowed in opt mode. | 1571 | u32 scoContStompMax; /* max number of continuous stomp allowed in opt mode. |
1572 | if excedded switch to pspoll mode | 1572 | if exceeded switch to pspoll mode |
1573 | default = 3 */ | 1573 | default = 3 */ |
1574 | 1574 | ||
1575 | u32 scoMinlowRateMbps; /* Low rate threshold */ | 1575 | u32 scoMinlowRateMbps; /* Low rate threshold */ |
@@ -2084,7 +2084,7 @@ typedef PREPACK struct { | |||
2084 | /* | 2084 | /* |
2085 | * BSS INFO HDR version 2.0 | 2085 | * BSS INFO HDR version 2.0 |
2086 | * With 6 bytes HTC header and 6 bytes of WMI header | 2086 | * With 6 bytes HTC header and 6 bytes of WMI header |
2087 | * WMI_BSS_INFO_HDR cannot be accomodated in the removed 802.11 management | 2087 | * WMI_BSS_INFO_HDR cannot be accommodated in the removed 802.11 management |
2088 | * header space. | 2088 | * header space. |
2089 | * - Reduce the ieMask to 2 bytes as only two bit flags are used | 2089 | * - Reduce the ieMask to 2 bytes as only two bit flags are used |
2090 | * - Remove rssi and compute it on the host. rssi = snr - 95 | 2090 | * - Remove rssi and compute it on the host. rssi = snr - 95 |
@@ -2911,7 +2911,7 @@ typedef PREPACK struct { | |||
2911 | u8 pktID; /* packet ID to identify parent packet */ | 2911 | u8 pktID; /* packet ID to identify parent packet */ |
2912 | u8 rateIdx; /* rate index on successful transmission */ | 2912 | u8 rateIdx; /* rate index on successful transmission */ |
2913 | u8 ackFailures; /* number of ACK failures in tx attempt */ | 2913 | u8 ackFailures; /* number of ACK failures in tx attempt */ |
2914 | #if 0 /* optional params currently ommitted. */ | 2914 | #if 0 /* optional params currently omitted. */ |
2915 | u32 queueDelay; // usec delay measured Tx Start time - host delivery time | 2915 | u32 queueDelay; // usec delay measured Tx Start time - host delivery time |
2916 | u32 mediaDelay; // usec delay measured ACK rx time - host delivery time | 2916 | u32 mediaDelay; // usec delay measured ACK rx time - host delivery time |
2917 | #endif | 2917 | #endif |
diff --git a/drivers/staging/ath6kl/include/common/wmix.h b/drivers/staging/ath6kl/include/common/wmix.h index 5ebb8285d135..36acba66d49f 100644 --- a/drivers/staging/ath6kl/include/common/wmix.h +++ b/drivers/staging/ath6kl/include/common/wmix.h | |||
@@ -191,7 +191,7 @@ typedef PREPACK struct { | |||
191 | } POSTPACK WMIX_GPIO_INTR_ACK_CMD; | 191 | } POSTPACK WMIX_GPIO_INTR_ACK_CMD; |
192 | 192 | ||
193 | /* | 193 | /* |
194 | * Target informs Host of GPIO interrupts that have ocurred since the | 194 | * Target informs Host of GPIO interrupts that have occurred since the |
195 | * last WMIX_GIPO_INTR_ACK_CMD was received. Additional information -- | 195 | * last WMIX_GIPO_INTR_ACK_CMD was received. Additional information -- |
196 | * the current GPIO input values is provided -- in order to support | 196 | * the current GPIO input values is provided -- in order to support |
197 | * use of a GPIO interrupt as a Data Valid signal for other GPIO pins. | 197 | * use of a GPIO interrupt as a Data Valid signal for other GPIO pins. |
diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h index 1bc2488788ab..4fb767559f82 100644 --- a/drivers/staging/ath6kl/include/htc_api.h +++ b/drivers/staging/ath6kl/include/htc_api.h | |||
@@ -209,7 +209,7 @@ struct htc_endpoint_credit_dist { | |||
209 | typedef enum _HTC_CREDIT_DIST_REASON { | 209 | typedef enum _HTC_CREDIT_DIST_REASON { |
210 | HTC_CREDIT_DIST_SEND_COMPLETE = 0, /* credits available as a result of completed | 210 | HTC_CREDIT_DIST_SEND_COMPLETE = 0, /* credits available as a result of completed |
211 | send operations (MANDATORY) resulting in credit reports */ | 211 | send operations (MANDATORY) resulting in credit reports */ |
212 | HTC_CREDIT_DIST_ACTIVITY_CHANGE = 1, /* a change in endpoint activity occured (OPTIONAL) */ | 212 | HTC_CREDIT_DIST_ACTIVITY_CHANGE = 1, /* a change in endpoint activity occurred (OPTIONAL) */ |
213 | HTC_CREDIT_DIST_SEEK_CREDITS, /* an endpoint needs to "seek" credits (OPTIONAL) */ | 213 | HTC_CREDIT_DIST_SEEK_CREDITS, /* an endpoint needs to "seek" credits (OPTIONAL) */ |
214 | HTC_DUMP_CREDIT_STATE /* for debugging, dump any state information that is kept by | 214 | HTC_DUMP_CREDIT_STATE /* for debugging, dump any state information that is kept by |
215 | the distribution function */ | 215 | the distribution function */ |
@@ -253,7 +253,7 @@ struct htc_endpoint_stats { | |||
253 | u32 RxPacketsBundled; /* count of recv packets received in a bundle */ | 253 | u32 RxPacketsBundled; /* count of recv packets received in a bundle */ |
254 | u32 RxBundleLookAheads; /* count of number of bundled lookaheads */ | 254 | u32 RxBundleLookAheads; /* count of number of bundled lookaheads */ |
255 | u32 RxBundleIndFromHdr; /* count of the number of bundle indications from the HTC header */ | 255 | u32 RxBundleIndFromHdr; /* count of the number of bundle indications from the HTC header */ |
256 | u32 RxAllocThreshHit; /* count of the number of times the recv allocation threshhold was hit */ | 256 | u32 RxAllocThreshHit; /* count of the number of times the recv allocation threshold was hit */ |
257 | u32 RxAllocThreshBytes; /* total number of bytes */ | 257 | u32 RxAllocThreshBytes; /* total number of bytes */ |
258 | }; | 258 | }; |
259 | 259 | ||
@@ -391,7 +391,7 @@ int HTCSendPkt(HTC_HANDLE HTCHandle, struct htc_packet *pPacket); | |||
391 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ | 391 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ |
392 | void HTCStop(HTC_HANDLE HTCHandle); | 392 | void HTCStop(HTC_HANDLE HTCHandle); |
393 | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 393 | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
394 | @desc: Destory HTC service | 394 | @desc: Destroy HTC service |
395 | @function name: HTCDestroy | 395 | @function name: HTCDestroy |
396 | @input: HTCHandle | 396 | @input: HTCHandle |
397 | @output: | 397 | @output: |
diff --git a/drivers/staging/ath6kl/miscdrv/credit_dist.c b/drivers/staging/ath6kl/miscdrv/credit_dist.c index ae54e1f48e50..33fa0209026d 100644 --- a/drivers/staging/ath6kl/miscdrv/credit_dist.c +++ b/drivers/staging/ath6kl/miscdrv/credit_dist.c | |||
@@ -341,7 +341,7 @@ static void SeekCredits(struct common_credit_state_info *pCredInfo, | |||
341 | credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek); | 341 | credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek); |
342 | 342 | ||
343 | if (credits >= pEPDist->TxCreditsSeek) { | 343 | if (credits >= pEPDist->TxCreditsSeek) { |
344 | /* we found some to fullfill the seek request */ | 344 | /* we found some to fulfill the seek request */ |
345 | break; | 345 | break; |
346 | } | 346 | } |
347 | 347 | ||
@@ -364,8 +364,8 @@ static void SeekCredits(struct common_credit_state_info *pCredInfo, | |||
364 | 364 | ||
365 | if ((pCurEpDist->TxCreditsAssigned - need) >= pCurEpDist->TxCreditsMin) { | 365 | if ((pCurEpDist->TxCreditsAssigned - need) >= pCurEpDist->TxCreditsMin) { |
366 | /* the current one has been allocated more than it's minimum and it | 366 | /* the current one has been allocated more than it's minimum and it |
367 | * has enough credits assigned above it's minimum to fullfill our need | 367 | * has enough credits assigned above it's minimum to fulfill our need |
368 | * try to take away just enough to fullfill our need */ | 368 | * try to take away just enough to fulfill our need */ |
369 | ReduceCredits(pCredInfo, | 369 | ReduceCredits(pCredInfo, |
370 | pCurEpDist, | 370 | pCurEpDist, |
371 | pCurEpDist->TxCreditsAssigned - need); | 371 | pCurEpDist->TxCreditsAssigned - need); |
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_android.c b/drivers/staging/ath6kl/os/linux/ar6000_android.c index c96f6e9c99c6..4aa75ee2cb13 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_android.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_android.c | |||
@@ -372,7 +372,7 @@ void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bo | |||
372 | } | 372 | } |
373 | } | 373 | } |
374 | if (needWake) { | 374 | if (needWake) { |
375 | /* keep host wake up if there is any event and packate comming in*/ | 375 | /* keep host wake up if there is any event and packate coming in*/ |
376 | if (wowledon) { | 376 | if (wowledon) { |
377 | char buf[32]; | 377 | char buf[32]; |
378 | int len = sprintf(buf, "on"); | 378 | int len = sprintf(buf, "on"); |
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index 27cb02dfad3c..97d6ce63b5c0 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -520,7 +520,7 @@ dbglog_parse_debug_logs(s8 *datap, u32 len) | |||
520 | int | 520 | int |
521 | ar6000_dbglog_get_debug_logs(struct ar6_softc *ar) | 521 | ar6000_dbglog_get_debug_logs(struct ar6_softc *ar) |
522 | { | 522 | { |
523 | u32 data[8]; /* Should be able to accomodate struct dbglog_buf_s */ | 523 | u32 data[8]; /* Should be able to accommodate struct dbglog_buf_s */ |
524 | u32 address; | 524 | u32 address; |
525 | u32 length; | 525 | u32 length; |
526 | u32 dropped; | 526 | u32 dropped; |
@@ -2063,7 +2063,7 @@ ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs) | |||
2063 | * - In case of surprise removal, the hcd already frees up the pending | 2063 | * - In case of surprise removal, the hcd already frees up the pending |
2064 | * for the device and hence there is no need to unregister the function | 2064 | * for the device and hence there is no need to unregister the function |
2065 | * driver inorder to get these requests. For planned removal, the function | 2065 | * driver inorder to get these requests. For planned removal, the function |
2066 | * driver has to explictly unregister itself to have the hcd return all the | 2066 | * driver has to explicitly unregister itself to have the hcd return all the |
2067 | * pending requests before the data structures for the devices are freed up. | 2067 | * pending requests before the data structures for the devices are freed up. |
2068 | * Note that as per the current implementation, the function driver will | 2068 | * Note that as per the current implementation, the function driver will |
2069 | * end up releasing all the devices since there is no API to selectively | 2069 | * end up releasing all the devices since there is no API to selectively |
@@ -2982,7 +2982,7 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev) | |||
2982 | /* If target is not associated */ | 2982 | /* If target is not associated */ |
2983 | if( (!ar->arConnected && !bypasswmi) | 2983 | if( (!ar->arConnected && !bypasswmi) |
2984 | #ifdef CONFIG_HOST_TCMD_SUPPORT | 2984 | #ifdef CONFIG_HOST_TCMD_SUPPORT |
2985 | /* TCMD doesnt support any data, free the buf and return */ | 2985 | /* TCMD doesn't support any data, free the buf and return */ |
2986 | || (ar->arTargetMode == AR6000_TCMD_MODE) | 2986 | || (ar->arTargetMode == AR6000_TCMD_MODE) |
2987 | #endif | 2987 | #endif |
2988 | ) { | 2988 | ) { |
@@ -6393,7 +6393,7 @@ static void DoHTCSendPktsTest(struct ar6_softc *ar, int MapNo, HTC_ENDPOINT_ID e | |||
6393 | /* | 6393 | /* |
6394 | * Add support for adding and removing a virtual adapter for soft AP. | 6394 | * Add support for adding and removing a virtual adapter for soft AP. |
6395 | * Some OS requires different adapters names for station and soft AP mode. | 6395 | * Some OS requires different adapters names for station and soft AP mode. |
6396 | * To support these requirement, create and destory a netdevice instance | 6396 | * To support these requirement, create and destroy a netdevice instance |
6397 | * when the AP mode is operational. A full fledged support for virual device | 6397 | * when the AP mode is operational. A full fledged support for virual device |
6398 | * is not implemented. Rather a virtual interface is created and is linked | 6398 | * is not implemented. Rather a virtual interface is created and is linked |
6399 | * with the existing physical device instance during the operation of the | 6399 | * with the existing physical device instance during the operation of the |
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c index 0ddaee21f9d7..a00bf0a59871 100644 --- a/drivers/staging/ath6kl/wmi/wmi.c +++ b/drivers/staging/ath6kl/wmi/wmi.c | |||
@@ -4867,7 +4867,7 @@ wmi_set_country(struct wmi_t *wmip, u8 *countryCode) | |||
4867 | #ifdef CONFIG_HOST_TCMD_SUPPORT | 4867 | #ifdef CONFIG_HOST_TCMD_SUPPORT |
4868 | /* WMI layer doesn't need to know the data type of the test cmd. | 4868 | /* WMI layer doesn't need to know the data type of the test cmd. |
4869 | This would be beneficial for customers like Qualcomm, who might | 4869 | This would be beneficial for customers like Qualcomm, who might |
4870 | have different test command requirements from differnt manufacturers | 4870 | have different test command requirements from different manufacturers |
4871 | */ | 4871 | */ |
4872 | int | 4872 | int |
4873 | wmi_test_cmd(struct wmi_t *wmip, u8 *buf, u32 len) | 4873 | wmi_test_cmd(struct wmi_t *wmip, u8 *buf, u32 len) |
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h index 32909e2938d5..20cca24ff5f0 100644 --- a/drivers/staging/bcm/Adapter.h +++ b/drivers/staging/bcm/Adapter.h | |||
@@ -412,7 +412,7 @@ struct _MINI_ADAPTER | |||
412 | 412 | ||
413 | // this to keep track of the Tx and Rx MailBox Registers. | 413 | // this to keep track of the Tx and Rx MailBox Registers. |
414 | atomic_t CurrNumFreeTxDesc; | 414 | atomic_t CurrNumFreeTxDesc; |
415 | // to keep track the no of byte recieved | 415 | // to keep track the no of byte received |
416 | USHORT PrevNumRecvDescs; | 416 | USHORT PrevNumRecvDescs; |
417 | USHORT CurrNumRecvDescs; | 417 | USHORT CurrNumRecvDescs; |
418 | UINT u32TotalDSD; | 418 | UINT u32TotalDSD; |
@@ -527,7 +527,7 @@ struct _MINI_ADAPTER | |||
527 | BOOLEAN bStatusWrite; | 527 | BOOLEAN bStatusWrite; |
528 | UINT uiNVMDSDSize; | 528 | UINT uiNVMDSDSize; |
529 | UINT uiVendorExtnFlag; | 529 | UINT uiVendorExtnFlag; |
530 | //it will always represent choosed DSD at any point of time. | 530 | //it will always represent chosen DSD at any point of time. |
531 | // Generally it is Active DSD but in case of NVM RD/WR it might be different. | 531 | // Generally it is Active DSD but in case of NVM RD/WR it might be different. |
532 | UINT ulFlashCalStart; | 532 | UINT ulFlashCalStart; |
533 | ULONG ulFlashControlSectionStart; | 533 | ULONG ulFlashControlSectionStart; |
@@ -546,10 +546,10 @@ struct _MINI_ADAPTER | |||
546 | PFLASH_CS_INFO psFlashCSInfo ; | 546 | PFLASH_CS_INFO psFlashCSInfo ; |
547 | PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo; | 547 | PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo; |
548 | UINT uiFlashBaseAdd; //Flash start address | 548 | UINT uiFlashBaseAdd; //Flash start address |
549 | UINT uiActiveISOOffset; //Active ISO offset choosen before f/w download | 549 | UINT uiActiveISOOffset; //Active ISO offset chosen before f/w download |
550 | FLASH2X_SECTION_VAL eActiveISO; //Active ISO section val | 550 | FLASH2X_SECTION_VAL eActiveISO; //Active ISO section val |
551 | FLASH2X_SECTION_VAL eActiveDSD; //Active DSD val choosen before f/w download | 551 | FLASH2X_SECTION_VAL eActiveDSD; //Active DSD val chosen before f/w download |
552 | UINT uiActiveDSDOffsetAtFwDld; //For accessing Active DSD choosen before f/w download | 552 | UINT uiActiveDSDOffsetAtFwDld; //For accessing Active DSD chosen before f/w download |
553 | UINT uiFlashLayoutMajorVersion ; | 553 | UINT uiFlashLayoutMajorVersion ; |
554 | UINT uiFlashLayoutMinorVersion; | 554 | UINT uiFlashLayoutMinorVersion; |
555 | BOOLEAN bAllDSDWriteAllow ; | 555 | BOOLEAN bAllDSDWriteAllow ; |
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index 9be184f143e5..c0ee95a71343 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c | |||
@@ -384,7 +384,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT | |||
384 | } | 384 | } |
385 | if(psfCSType->cCPacketClassificationRule.u8Protocol == 0) | 385 | if(psfCSType->cCPacketClassificationRule.u8Protocol == 0) |
386 | { | 386 | { |
387 | //we didnt get protocol field filled in by the BS | 387 | //we didn't get protocol field filled in by the BS |
388 | pstClassifierEntry->ucProtocolLength=0; | 388 | pstClassifierEntry->ucProtocolLength=0; |
389 | } | 389 | } |
390 | else | 390 | else |
@@ -879,7 +879,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the A | |||
879 | 879 | ||
880 | /* | 880 | /* |
881 | Passing the argument u8PHSI instead of clsid. Because for DL with no classifier rule, | 881 | Passing the argument u8PHSI instead of clsid. Because for DL with no classifier rule, |
882 | clsid will be zero hence we cant have multiple PHS rules for the same SF. | 882 | clsid will be zero hence we can't have multiple PHS rules for the same SF. |
883 | To support multiple PHS rule, passing u8PHSI. | 883 | To support multiple PHS rule, passing u8PHSI. |
884 | */ | 884 | */ |
885 | 885 | ||
@@ -1103,7 +1103,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) | |||
1103 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%X", | 1103 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%X", |
1104 | pstAddIndication->sfAuthorizedSet.u8TrafficIndicationPreference); | 1104 | pstAddIndication->sfAuthorizedSet.u8TrafficIndicationPreference); |
1105 | 1105 | ||
1106 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Recieved : 0x%X",pstAddIndication->sfAuthorizedSet.u8TotalClassifiers); | 1106 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Received : 0x%X",pstAddIndication->sfAuthorizedSet.u8TotalClassifiers); |
1107 | 1107 | ||
1108 | nCurClassifierCnt = pstAddIndication->sfAuthorizedSet.u8TotalClassifiers; | 1108 | nCurClassifierCnt = pstAddIndication->sfAuthorizedSet.u8TotalClassifiers; |
1109 | 1109 | ||
@@ -1305,7 +1305,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) | |||
1305 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%02X", | 1305 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%02X", |
1306 | pstAddIndication->sfAdmittedSet.u8TrafficIndicationPreference); | 1306 | pstAddIndication->sfAdmittedSet.u8TrafficIndicationPreference); |
1307 | 1307 | ||
1308 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Recieved : 0x%X",pstAddIndication->sfAdmittedSet.u8TotalClassifiers); | 1308 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Received : 0x%X",pstAddIndication->sfAdmittedSet.u8TotalClassifiers); |
1309 | 1309 | ||
1310 | nCurClassifierCnt = pstAddIndication->sfAdmittedSet.u8TotalClassifiers; | 1310 | nCurClassifierCnt = pstAddIndication->sfAdmittedSet.u8TotalClassifiers; |
1311 | 1311 | ||
@@ -1502,7 +1502,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) | |||
1502 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8TrafficIndicationPreference : 0x%X", | 1502 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8TrafficIndicationPreference : 0x%X", |
1503 | pstAddIndication->sfActiveSet.u8TrafficIndicationPreference); | 1503 | pstAddIndication->sfActiveSet.u8TrafficIndicationPreference); |
1504 | 1504 | ||
1505 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Recieved : 0x%X",pstAddIndication->sfActiveSet.u8TotalClassifiers); | 1505 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Received : 0x%X",pstAddIndication->sfActiveSet.u8TotalClassifiers); |
1506 | 1506 | ||
1507 | nCurClassifierCnt = pstAddIndication->sfActiveSet.u8TotalClassifiers; | 1507 | nCurClassifierCnt = pstAddIndication->sfActiveSet.u8TotalClassifiers; |
1508 | 1508 | ||
@@ -1696,7 +1696,7 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *p | |||
1696 | //No Special handling send the message as it is | 1696 | //No Special handling send the message as it is |
1697 | return 1; | 1697 | return 1; |
1698 | } | 1698 | } |
1699 | // For DSA_REQ, only upto "psfAuthorizedSet" parameter should be accessed by driver! | 1699 | // For DSA_REQ, only up to "psfAuthorizedSet" parameter should be accessed by driver! |
1700 | 1700 | ||
1701 | pstAddIndication=kmalloc(sizeof(*pstAddIndication), GFP_KERNEL); | 1701 | pstAddIndication=kmalloc(sizeof(*pstAddIndication), GFP_KERNEL); |
1702 | if(NULL==pstAddIndication) | 1702 | if(NULL==pstAddIndication) |
@@ -1788,7 +1788,7 @@ static inline stLocalSFAddIndicationAlt | |||
1788 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Inside RestoreCmControlResponseMessage "); | 1788 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Inside RestoreCmControlResponseMessage "); |
1789 | /* | 1789 | /* |
1790 | //Need to Allocate memory to contain the SUPER Large structures | 1790 | //Need to Allocate memory to contain the SUPER Large structures |
1791 | //Our driver cant create these structures on Stack :( | 1791 | //Our driver can't create these structures on Stack :( |
1792 | */ | 1792 | */ |
1793 | pstAddIndicationDest=kmalloc(sizeof(stLocalSFAddIndicationAlt), GFP_KERNEL); | 1793 | pstAddIndicationDest=kmalloc(sizeof(stLocalSFAddIndicationAlt), GFP_KERNEL); |
1794 | 1794 | ||
@@ -1957,7 +1957,7 @@ INT AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter) | |||
1957 | { | 1957 | { |
1958 | /* | 1958 | /* |
1959 | //Need to Allocate memory to contain the SUPER Large structures | 1959 | //Need to Allocate memory to contain the SUPER Large structures |
1960 | //Our driver cant create these structures on Stack | 1960 | //Our driver can't create these structures on Stack |
1961 | */ | 1961 | */ |
1962 | Adapter->caDsxReqResp=kmalloc(sizeof(stLocalSFAddIndicationAlt)+LEADER_SIZE, GFP_KERNEL); | 1962 | Adapter->caDsxReqResp=kmalloc(sizeof(stLocalSFAddIndicationAlt)+LEADER_SIZE, GFP_KERNEL); |
1963 | if(!Adapter->caDsxReqResp) | 1963 | if(!Adapter->caDsxReqResp) |
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h index f17a4f13474c..e34531b638e8 100644 --- a/drivers/staging/bcm/HostMIBSInterface.h +++ b/drivers/staging/bcm/HostMIBSInterface.h | |||
@@ -62,7 +62,7 @@ typedef struct _S_MIBS_HOST_INFO | |||
62 | ULONG NumDesUsed; | 62 | ULONG NumDesUsed; |
63 | ULONG CurrNumFreeDesc; | 63 | ULONG CurrNumFreeDesc; |
64 | ULONG PrevNumFreeDesc; | 64 | ULONG PrevNumFreeDesc; |
65 | // to keep track the no of byte recieved | 65 | // to keep track the no of byte received |
66 | ULONG PrevNumRcevBytes; | 66 | ULONG PrevNumRcevBytes; |
67 | ULONG CurrNumRcevBytes; | 67 | ULONG CurrNumRcevBytes; |
68 | 68 | ||
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c index 91b6fbe33c91..5b4fd372ec36 100644 --- a/drivers/staging/bcm/IPv6Protocol.c +++ b/drivers/staging/bcm/IPv6Protocol.c | |||
@@ -287,7 +287,7 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head | |||
287 | 287 | ||
288 | for(uiLoopIndex=0;uiLoopIndex<uiCountIPSrcAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords) | 288 | for(uiLoopIndex=0;uiLoopIndex<uiCountIPSrcAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords) |
289 | { | 289 | { |
290 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Address In Recieved Packet : \n "); | 290 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Address In Received Packet : \n "); |
291 | DumpIpv6Address(aulSrcIP); | 291 | DumpIpv6Address(aulSrcIP); |
292 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Mask In Classifier Rule: \n"); | 292 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Mask In Classifier Rule: \n"); |
293 | DumpIpv6Address(&pstClassifierRule->stSrcIpAddress.ulIpv6Mask[uiLoopIndex]); | 293 | DumpIpv6Address(&pstClassifierRule->stSrcIpAddress.ulIpv6Mask[uiLoopIndex]); |
@@ -340,7 +340,7 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea | |||
340 | 340 | ||
341 | for(uiLoopIndex=0;uiLoopIndex<uiCountIPDestinationAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords) | 341 | for(uiLoopIndex=0;uiLoopIndex<uiCountIPDestinationAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords) |
342 | { | 342 | { |
343 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Address In Recieved Packet : \n "); | 343 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Address In Received Packet : \n "); |
344 | DumpIpv6Address(aulDestIP); | 344 | DumpIpv6Address(aulDestIP); |
345 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Mask In Classifier Rule: \n"); | 345 | BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Mask In Classifier Rule: \n"); |
346 | DumpIpv6Address(&pstClassifierRule->stDestIpAddress.ulIpv6Mask[uiLoopIndex]); | 346 | DumpIpv6Address(&pstClassifierRule->stDestIpAddress.ulIpv6Mask[uiLoopIndex]); |
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c index bf5c0ad86610..96fa4ead7930 100644 --- a/drivers/staging/bcm/InterfaceIdleMode.c +++ b/drivers/staging/bcm/InterfaceIdleMode.c | |||
@@ -11,7 +11,7 @@ Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context | |||
11 | 11 | ||
12 | 12 | ||
13 | Return: BCM_STATUS_SUCCESS - If Wakeup of the HW Interface was successful. | 13 | Return: BCM_STATUS_SUCCESS - If Wakeup of the HW Interface was successful. |
14 | Other - If an error occured. | 14 | Other - If an error occurred. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | 17 | ||
@@ -26,7 +26,7 @@ Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context | |||
26 | 26 | ||
27 | 27 | ||
28 | Return: BCM_STATUS_SUCCESS - If Idle mode response related HW configuration was successful. | 28 | Return: BCM_STATUS_SUCCESS - If Idle mode response related HW configuration was successful. |
29 | Other - If an error occured. | 29 | Other - If an error occurred. |
30 | */ | 30 | */ |
31 | 31 | ||
32 | /* | 32 | /* |
diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c index 220ff922bdcf..67719d57256d 100644 --- a/drivers/staging/bcm/InterfaceIsr.c +++ b/drivers/staging/bcm/InterfaceIsr.c | |||
@@ -80,8 +80,8 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) | |||
80 | } | 80 | } |
81 | case -EINPROGRESS: | 81 | case -EINPROGRESS: |
82 | { | 82 | { |
83 | //This situation may happend when URBunlink is used. for detail check usb_unlink_urb documentation. | 83 | //This situation may happened when URBunlink is used. for detail check usb_unlink_urb documentation. |
84 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Impossibe condition has occured... something very bad is going on"); | 84 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Impossibe condition has occurred... something very bad is going on"); |
85 | break ; | 85 | break ; |
86 | //return; | 86 | //return; |
87 | } | 87 | } |
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c index 533f8ebe0f84..806ef5d18522 100644 --- a/drivers/staging/bcm/InterfaceRx.c +++ b/drivers/staging/bcm/InterfaceRx.c | |||
@@ -34,7 +34,7 @@ GetBulkInRcb(PS_INTERFACE_ADAPTER psIntfAdapter) | |||
34 | return pRcb; | 34 | return pRcb; |
35 | } | 35 | } |
36 | 36 | ||
37 | /*this is receive call back - when pkt avilable for receive (BULK IN- end point)*/ | 37 | /*this is receive call back - when pkt available for receive (BULK IN- end point)*/ |
38 | static void read_bulk_callback(struct urb *urb) | 38 | static void read_bulk_callback(struct urb *urb) |
39 | { | 39 | { |
40 | struct sk_buff *skb = NULL; | 40 | struct sk_buff *skb = NULL; |
@@ -123,7 +123,7 @@ static void read_bulk_callback(struct urb *urb) | |||
123 | if((ntohs(pLeader->Vcid) == VCID_CONTROL_PACKET) || | 123 | if((ntohs(pLeader->Vcid) == VCID_CONTROL_PACKET) || |
124 | (!(pLeader->Status >= 0x20 && pLeader->Status <= 0x3F))) | 124 | (!(pLeader->Status >= 0x20 && pLeader->Status <= 0x3F))) |
125 | { | 125 | { |
126 | BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Recived control pkt..."); | 126 | BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Received control pkt..."); |
127 | *(PUSHORT)skb->data = pLeader->Status; | 127 | *(PUSHORT)skb->data = pLeader->Status; |
128 | memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer + | 128 | memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer + |
129 | (sizeof(LEADER)), pLeader->PLength); | 129 | (sizeof(LEADER)), pLeader->PLength); |
@@ -142,7 +142,7 @@ static void read_bulk_callback(struct urb *urb) | |||
142 | * Data Packet, Format a proper Ethernet Header | 142 | * Data Packet, Format a proper Ethernet Header |
143 | * and give it to the stack | 143 | * and give it to the stack |
144 | */ | 144 | */ |
145 | BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Recived Data pkt..."); | 145 | BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt..."); |
146 | skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES); | 146 | skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES); |
147 | memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(LEADER), pLeader->PLength); | 147 | memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(LEADER), pLeader->PLength); |
148 | skb->dev = Adapter->dev; | 148 | skb->dev = Adapter->dev; |
@@ -151,7 +151,7 @@ static void read_bulk_callback(struct urb *urb) | |||
151 | skb_put (skb, pLeader->PLength + ETH_HLEN); | 151 | skb_put (skb, pLeader->PLength + ETH_HLEN); |
152 | Adapter->PackInfo[QueueIndex].uiTotalRxBytes+=pLeader->PLength; | 152 | Adapter->PackInfo[QueueIndex].uiTotalRxBytes+=pLeader->PLength; |
153 | Adapter->PackInfo[QueueIndex].uiThisPeriodRxBytes+= pLeader->PLength; | 153 | Adapter->PackInfo[QueueIndex].uiThisPeriodRxBytes+= pLeader->PLength; |
154 | BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Recived Data pkt of len :0x%X", pLeader->PLength); | 154 | BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt of len :0x%X", pLeader->PLength); |
155 | 155 | ||
156 | if(netif_running(Adapter->dev)) | 156 | if(netif_running(Adapter->dev)) |
157 | { | 157 | { |
@@ -237,7 +237,7 @@ Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context | |||
237 | 237 | ||
238 | 238 | ||
239 | Return: TRUE - If Rx was successful. | 239 | Return: TRUE - If Rx was successful. |
240 | Other - If an error occured. | 240 | Other - If an error occurred. |
241 | */ | 241 | */ |
242 | 242 | ||
243 | BOOLEAN InterfaceRx (PS_INTERFACE_ADAPTER psIntfAdapter) | 243 | BOOLEAN InterfaceRx (PS_INTERFACE_ADAPTER psIntfAdapter) |
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h index e4f8eb70be1e..f859cf1c47b0 100644 --- a/drivers/staging/bcm/Ioctl.h +++ b/drivers/staging/bcm/Ioctl.h | |||
@@ -241,7 +241,7 @@ typedef struct bulkwrmbuffer | |||
241 | 241 | ||
242 | typedef enum _FLASH2X_SECTION_VAL | 242 | typedef enum _FLASH2X_SECTION_VAL |
243 | { | 243 | { |
244 | NO_SECTION_VAL = 0, //no section is choosen when absolute offset is given for RD/WR | 244 | NO_SECTION_VAL = 0, //no section is chosen when absolute offset is given for RD/WR |
245 | ISO_IMAGE1, | 245 | ISO_IMAGE1, |
246 | ISO_IMAGE2, | 246 | ISO_IMAGE2, |
247 | DSD0, | 247 | DSD0, |
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c index f4cf41c0e46b..a55d4228e8e0 100644 --- a/drivers/staging/bcm/LeakyBucket.c +++ b/drivers/staging/bcm/LeakyBucket.c | |||
@@ -213,7 +213,7 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF) | |||
213 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "For Queue: %zd\n", psSF-Adapter->PackInfo); | 213 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "For Queue: %zd\n", psSF-Adapter->PackInfo); |
214 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "\nAvailable Tokens = %d required = %d\n", | 214 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "\nAvailable Tokens = %d required = %d\n", |
215 | psSF->uiCurrentTokenCount, iPacketLen); | 215 | psSF->uiCurrentTokenCount, iPacketLen); |
216 | //this part indicates that becuase of non-availability of the tokens | 216 | //this part indicates that because of non-availability of the tokens |
217 | //pkt has not been send out hence setting the pending flag indicating the host to send it out | 217 | //pkt has not been send out hence setting the pending flag indicating the host to send it out |
218 | //first next iteration . | 218 | //first next iteration . |
219 | psSF->uiPendedLast = TRUE; | 219 | psSF->uiPendedLast = TRUE; |
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c index d624f35d0551..c5003b62234c 100644 --- a/drivers/staging/bcm/Misc.c +++ b/drivers/staging/bcm/Misc.c | |||
@@ -602,7 +602,7 @@ VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter,PUCHAR pucBuffer) | |||
602 | Adapter->LinkStatus=LINKUP_DONE; | 602 | Adapter->LinkStatus=LINKUP_DONE; |
603 | Adapter->bPHSEnabled = *(pucBuffer+3); | 603 | Adapter->bPHSEnabled = *(pucBuffer+3); |
604 | Adapter->bETHCSEnabled = *(pucBuffer+4) & ETH_CS_MASK; | 604 | Adapter->bETHCSEnabled = *(pucBuffer+4) & ETH_CS_MASK; |
605 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "PHS Support Status Recieved In LinkUp Ack : %x \n",Adapter->bPHSEnabled); | 605 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "PHS Support Status Received In LinkUp Ack : %x \n",Adapter->bPHSEnabled); |
606 | if((FALSE == Adapter->bShutStatus)&& | 606 | if((FALSE == Adapter->bShutStatus)&& |
607 | (FALSE == Adapter->IdleMode)) | 607 | (FALSE == Adapter->IdleMode)) |
608 | { | 608 | { |
@@ -1153,7 +1153,7 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter) | |||
1153 | 1153 | ||
1154 | /* | 1154 | /* |
1155 | * 1. If the LED Settings fails, do not stop and do the Firmware download. | 1155 | * 1. If the LED Settings fails, do not stop and do the Firmware download. |
1156 | * 2. This init would happend only if the cfg file is present, else | 1156 | * 2. This init would happened only if the cfg file is present, else |
1157 | * call from the ioctl context. | 1157 | * call from the ioctl context. |
1158 | */ | 1158 | */ |
1159 | 1159 | ||
@@ -1185,7 +1185,7 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter) | |||
1185 | status = PropagateCalParamsFromFlashToMemory(ps_adapter); | 1185 | status = PropagateCalParamsFromFlashToMemory(ps_adapter); |
1186 | if(status) | 1186 | if(status) |
1187 | { | 1187 | { |
1188 | BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL," Propogation of Cal param failed .." ); | 1188 | BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL," Propagation of Cal param failed .." ); |
1189 | goto OUT; | 1189 | goto OUT; |
1190 | } | 1190 | } |
1191 | } | 1191 | } |
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index feade9451b2e..c97020f0fb6a 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c | |||
@@ -727,7 +727,7 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s | |||
727 | 727 | ||
728 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS UserPrio:%x CLS VLANID:%x\n",__FUNCTION__,ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),pstClassifierRule->usVLANID); | 728 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS UserPrio:%x CLS VLANID:%x\n",__FUNCTION__,ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),pstClassifierRule->usVLANID); |
729 | 729 | ||
730 | /* In case FW didn't recieve the TLV, the priority field should be ignored */ | 730 | /* In case FW didn't receive the TLV, the priority field should be ignored */ |
731 | if(pstClassifierRule->usValidityBitMap & (1<<PKT_CLASSIFICATION_USER_PRIORITY_VALID)) | 731 | if(pstClassifierRule->usValidityBitMap & (1<<PKT_CLASSIFICATION_USER_PRIORITY_VALID)) |
732 | { | 732 | { |
733 | if(pstEthCsPktInfo->eNwpktEthFrameType!=eEth802QVLANFrame) | 733 | if(pstEthCsPktInfo->eNwpktEthFrameType!=eEth802QVLANFrame) |
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h index 890778450a86..ab131806e2c9 100644 --- a/drivers/staging/bcm/cntrl_SignalingInterface.h +++ b/drivers/staging/bcm/cntrl_SignalingInterface.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #define VENDOR_PHS_PARAM_LENGTH 10 | 21 | #define VENDOR_PHS_PARAM_LENGTH 10 |
22 | #define MAX_NUM_ACTIVE_BS 10 | 22 | #define MAX_NUM_ACTIVE_BS 10 |
23 | #define AUTH_TOKEN_LENGTH 10 | 23 | #define AUTH_TOKEN_LENGTH 10 |
24 | #define NUM_HARQ_CHANNELS 16 //Changed from 10 to 16 to accomodate all HARQ channels | 24 | #define NUM_HARQ_CHANNELS 16 //Changed from 10 to 16 to accommodate all HARQ channels |
25 | #define VENDOR_CLASSIFIER_PARAM_LENGTH 1 //Changed the size to 1 byte since we dnt use it | 25 | #define VENDOR_CLASSIFIER_PARAM_LENGTH 1 //Changed the size to 1 byte since we dnt use it |
26 | #define VENDOR_SPECIF_QOS_PARAM 1 | 26 | #define VENDOR_SPECIF_QOS_PARAM 1 |
27 | #define VENDOR_PHS_PARAM_LENGTH 10 | 27 | #define VENDOR_PHS_PARAM_LENGTH 10 |
@@ -109,13 +109,13 @@ typedef struct _stPhsRuleSI { | |||
109 | B_UINT8 u8PHSI; | 109 | B_UINT8 u8PHSI; |
110 | /** PHSF Length Of The Service Flow*/ | 110 | /** PHSF Length Of The Service Flow*/ |
111 | B_UINT8 u8PHSFLength; | 111 | B_UINT8 u8PHSFLength; |
112 | /** String of bytes containing header information to be supressed by the sending CS and reconstructed by the receiving CS*/ | 112 | /** String of bytes containing header information to be suppressed by the sending CS and reconstructed by the receiving CS*/ |
113 | B_UINT8 u8PHSF[MAX_PHS_LENGTHS]; | 113 | B_UINT8 u8PHSF[MAX_PHS_LENGTHS]; |
114 | /** PHSM Length Of The Service Flow*/ | 114 | /** PHSM Length Of The Service Flow*/ |
115 | B_UINT8 u8PHSMLength; | 115 | B_UINT8 u8PHSMLength; |
116 | /** PHS Mask for the SF*/ | 116 | /** PHS Mask for the SF*/ |
117 | B_UINT8 u8PHSM[MAX_PHS_LENGTHS]; | 117 | B_UINT8 u8PHSM[MAX_PHS_LENGTHS]; |
118 | /** 8bit Total number of bytes to be supressed for the Service Flow*/ | 118 | /** 8bit Total number of bytes to be suppressed for the Service Flow*/ |
119 | B_UINT8 u8PHSS; | 119 | B_UINT8 u8PHSS; |
120 | /** 8bit Indicates whether or not Packet Header contents need to be verified prior to supression */ | 120 | /** 8bit Indicates whether or not Packet Header contents need to be verified prior to supression */ |
121 | B_UINT8 u8PHSV; | 121 | B_UINT8 u8PHSV; |
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c index c7292373a65f..4da5b7b54a1a 100644 --- a/drivers/staging/bcm/nvm.c +++ b/drivers/staging/bcm/nvm.c | |||
@@ -313,7 +313,7 @@ INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter) | |||
313 | // uiNumBytes - Number of bytes to be read from the EEPROM. | 313 | // uiNumBytes - Number of bytes to be read from the EEPROM. |
314 | // | 314 | // |
315 | // Returns: | 315 | // Returns: |
316 | // OSAL_STATUS_SUCCESS - if EEPROM read is successfull. | 316 | // OSAL_STATUS_SUCCESS - if EEPROM read is successful. |
317 | // <FAILURE> - if failed. | 317 | // <FAILURE> - if failed. |
318 | //----------------------------------------------------------------------------- | 318 | //----------------------------------------------------------------------------- |
319 | 319 | ||
@@ -431,7 +431,7 @@ INT BeceemEEPROMBulkRead( | |||
431 | // uiNumBytes - Number of bytes to be read from the FLASH. | 431 | // uiNumBytes - Number of bytes to be read from the FLASH. |
432 | // | 432 | // |
433 | // Returns: | 433 | // Returns: |
434 | // OSAL_STATUS_SUCCESS - if FLASH read is successfull. | 434 | // OSAL_STATUS_SUCCESS - if FLASH read is successful. |
435 | // <FAILURE> - if failed. | 435 | // <FAILURE> - if failed. |
436 | //----------------------------------------------------------------------------- | 436 | //----------------------------------------------------------------------------- |
437 | 437 | ||
@@ -1174,7 +1174,7 @@ static INT BeceemFlashBulkWrite( | |||
1174 | if(NULL == pTempBuff) | 1174 | if(NULL == pTempBuff) |
1175 | goto BeceemFlashBulkWrite_EXIT; | 1175 | goto BeceemFlashBulkWrite_EXIT; |
1176 | // | 1176 | // |
1177 | // check if the data to be written is overlapped accross sectors | 1177 | // check if the data to be written is overlapped across sectors |
1178 | // | 1178 | // |
1179 | if(uiOffset+uiNumBytes < uiSectBoundary) | 1179 | if(uiOffset+uiNumBytes < uiSectBoundary) |
1180 | { | 1180 | { |
@@ -1390,7 +1390,7 @@ static INT BeceemFlashBulkWriteStatus( | |||
1390 | goto BeceemFlashBulkWriteStatus_EXIT; | 1390 | goto BeceemFlashBulkWriteStatus_EXIT; |
1391 | 1391 | ||
1392 | // | 1392 | // |
1393 | // check if the data to be written is overlapped accross sectors | 1393 | // check if the data to be written is overlapped across sectors |
1394 | // | 1394 | // |
1395 | if(uiOffset+uiNumBytes < uiSectBoundary) | 1395 | if(uiOffset+uiNumBytes < uiSectBoundary) |
1396 | { | 1396 | { |
@@ -2020,7 +2020,7 @@ INT BeceemEEPROMBulkWrite( | |||
2020 | // uiNumBytes - Number of bytes to be read from the NVM. | 2020 | // uiNumBytes - Number of bytes to be read from the NVM. |
2021 | // | 2021 | // |
2022 | // Returns: | 2022 | // Returns: |
2023 | // OSAL_STATUS_SUCCESS - if NVM read is successfull. | 2023 | // OSAL_STATUS_SUCCESS - if NVM read is successful. |
2024 | // <FAILURE> - if failed. | 2024 | // <FAILURE> - if failed. |
2025 | //----------------------------------------------------------------------------- | 2025 | //----------------------------------------------------------------------------- |
2026 | 2026 | ||
@@ -2083,7 +2083,7 @@ INT BeceemNVMRead( | |||
2083 | // uiNumBytes - Number of bytes to be written.. | 2083 | // uiNumBytes - Number of bytes to be written.. |
2084 | // | 2084 | // |
2085 | // Returns: | 2085 | // Returns: |
2086 | // OSAL_STATUS_SUCCESS - if NVM write is successfull. | 2086 | // OSAL_STATUS_SUCCESS - if NVM write is successful. |
2087 | // <FAILURE> - if failed. | 2087 | // <FAILURE> - if failed. |
2088 | //----------------------------------------------------------------------------- | 2088 | //----------------------------------------------------------------------------- |
2089 | 2089 | ||
@@ -2218,7 +2218,7 @@ INT BeceemNVMWrite( | |||
2218 | // uiSectorSize - sector size | 2218 | // uiSectorSize - sector size |
2219 | // | 2219 | // |
2220 | // Returns: | 2220 | // Returns: |
2221 | // OSAL_STATUS_SUCCESS - if NVM write is successfull. | 2221 | // OSAL_STATUS_SUCCESS - if NVM write is successful. |
2222 | // <FAILURE> - if failed. | 2222 | // <FAILURE> - if failed. |
2223 | //----------------------------------------------------------------------------- | 2223 | //----------------------------------------------------------------------------- |
2224 | 2224 | ||
@@ -2430,7 +2430,7 @@ INT BcmInitNVM(PMINI_ADAPTER ps_adapter) | |||
2430 | *Input Parameter: | 2430 | *Input Parameter: |
2431 | * Adapter data structure | 2431 | * Adapter data structure |
2432 | *Return Value : | 2432 | *Return Value : |
2433 | * 0. means sucess; | 2433 | * 0. means success; |
2434 | */ | 2434 | */ |
2435 | /***************************************************************************/ | 2435 | /***************************************************************************/ |
2436 | 2436 | ||
@@ -2998,7 +2998,7 @@ INT BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlas | |||
2998 | /* | 2998 | /* |
2999 | * Considering all the section for which end offset can be calculated or directly given | 2999 | * Considering all the section for which end offset can be calculated or directly given |
3000 | * in CS Structure. if matching case does not exist, return STATUS_FAILURE indicating section | 3000 | * in CS Structure. if matching case does not exist, return STATUS_FAILURE indicating section |
3001 | * endoffset can't be calculated or given in CS Stucture. | 3001 | * endoffset can't be calculated or given in CS Structure. |
3002 | */ | 3002 | */ |
3003 | 3003 | ||
3004 | INT SectStartOffset = 0 ; | 3004 | INT SectStartOffset = 0 ; |
@@ -3173,7 +3173,7 @@ INT BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2 | |||
3173 | * @uiNumBytes : Number of Bytes for Read | 3173 | * @uiNumBytes : Number of Bytes for Read |
3174 | * | 3174 | * |
3175 | * Return value:- | 3175 | * Return value:- |
3176 | * return true on sucess and STATUS_FAILURE on fail. | 3176 | * return true on success and STATUS_FAILURE on fail. |
3177 | */ | 3177 | */ |
3178 | 3178 | ||
3179 | INT BcmFlash2xBulkRead( | 3179 | INT BcmFlash2xBulkRead( |
@@ -3241,7 +3241,7 @@ INT BcmFlash2xBulkRead( | |||
3241 | * @uiNumBytes : Number of Bytes for Write | 3241 | * @uiNumBytes : Number of Bytes for Write |
3242 | * | 3242 | * |
3243 | * Return value:- | 3243 | * Return value:- |
3244 | * return true on sucess and STATUS_FAILURE on fail. | 3244 | * return true on success and STATUS_FAILURE on fail. |
3245 | * | 3245 | * |
3246 | */ | 3246 | */ |
3247 | 3247 | ||
@@ -3308,7 +3308,7 @@ INT BcmFlash2xBulkWrite( | |||
3308 | * @Adapter :-Drivers private Data Structure | 3308 | * @Adapter :-Drivers private Data Structure |
3309 | * | 3309 | * |
3310 | * Return Value:- | 3310 | * Return Value:- |
3311 | * Return STATUS_SUCESS if get sucess in setting the right DSD else negaive error code | 3311 | * Return STATUS_SUCESS if get success in setting the right DSD else negaive error code |
3312 | * | 3312 | * |
3313 | **/ | 3313 | **/ |
3314 | static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter) | 3314 | static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter) |
@@ -3384,7 +3384,7 @@ static INT BcmGetActiveISO(PMINI_ADAPTER Adapter) | |||
3384 | * @uiOffset : Offset provided in the Flash | 3384 | * @uiOffset : Offset provided in the Flash |
3385 | * | 3385 | * |
3386 | * Return Value:- | 3386 | * Return Value:- |
3387 | * Sucess:-TRUE , offset is writable | 3387 | * Success:-TRUE , offset is writable |
3388 | * Failure:-FALSE, offset is RO | 3388 | * Failure:-FALSE, offset is RO |
3389 | * | 3389 | * |
3390 | **/ | 3390 | **/ |
@@ -3441,7 +3441,7 @@ static INT BcmDumpFlash2xSectionBitMap(PFLASH2X_BITMAP psFlash2xBitMap) | |||
3441 | @Adapter:-Driver private Data Structure | 3441 | @Adapter:-Driver private Data Structure |
3442 | * | 3442 | * |
3443 | * Return value:- | 3443 | * Return value:- |
3444 | * Sucess:- STATUS_SUCESS | 3444 | * Success:- STATUS_SUCESS |
3445 | * Failure:- negative error code | 3445 | * Failure:- negative error code |
3446 | **/ | 3446 | **/ |
3447 | 3447 | ||
@@ -3783,7 +3783,7 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV | |||
3783 | // This is a SPECIAL Case which will only happen if the current highest priority ISO has priority value = 0x7FFFFFFF. | 3783 | // This is a SPECIAL Case which will only happen if the current highest priority ISO has priority value = 0x7FFFFFFF. |
3784 | // We will write 1 to the current Highest priority ISO And then shall increase the priority of the requested ISO | 3784 | // We will write 1 to the current Highest priority ISO And then shall increase the priority of the requested ISO |
3785 | // by user | 3785 | // by user |
3786 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "SectImagePriority wraparound happend, eFlash2xSectVal: 0x%x\n",eFlash2xSectVal); | 3786 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",eFlash2xSectVal); |
3787 | SectImagePriority = htonl(0x1); | 3787 | SectImagePriority = htonl(0x1); |
3788 | Status = BcmFlash2xBulkWrite(Adapter, | 3788 | Status = BcmFlash2xBulkWrite(Adapter, |
3789 | &SectImagePriority, | 3789 | &SectImagePriority, |
@@ -3853,7 +3853,7 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV | |||
3853 | // This is a SPECIAL Case which will only happen if the current highest priority DSD has priority value = 0x7FFFFFFF. | 3853 | // This is a SPECIAL Case which will only happen if the current highest priority DSD has priority value = 0x7FFFFFFF. |
3854 | // We will write 1 to the current Highest priority DSD And then shall increase the priority of the requested DSD | 3854 | // We will write 1 to the current Highest priority DSD And then shall increase the priority of the requested DSD |
3855 | // by user | 3855 | // by user |
3856 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, NVM_RW, DBG_LVL_ALL, "SectImagePriority wraparound happend, eFlash2xSectVal: 0x%x\n",eFlash2xSectVal); | 3856 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, NVM_RW, DBG_LVL_ALL, "SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",eFlash2xSectVal); |
3857 | SectImagePriority = htonl(0x1); | 3857 | SectImagePriority = htonl(0x1); |
3858 | 3858 | ||
3859 | Status = BcmFlash2xBulkWrite(Adapter, | 3859 | Status = BcmFlash2xBulkWrite(Adapter, |
@@ -4119,7 +4119,7 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) | |||
4119 | MAX_RW_SIZE); | 4119 | MAX_RW_SIZE); |
4120 | IsThisHeaderSector = FALSE ; | 4120 | IsThisHeaderSector = FALSE ; |
4121 | } | 4121 | } |
4122 | //substracting the written Data | 4122 | //subtracting the written Data |
4123 | uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ; | 4123 | uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ; |
4124 | } | 4124 | } |
4125 | 4125 | ||
@@ -4250,7 +4250,7 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) | |||
4250 | IsThisHeaderSector = FALSE ; | 4250 | IsThisHeaderSector = FALSE ; |
4251 | } | 4251 | } |
4252 | 4252 | ||
4253 | //substracting the written Data | 4253 | //subtracting the written Data |
4254 | uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ; | 4254 | uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ; |
4255 | } | 4255 | } |
4256 | 4256 | ||
@@ -4268,7 +4268,7 @@ BcmFlash2xCorruptSig : this API is used to corrupt the written sig in Bcm Header | |||
4268 | @eFlash2xSectionVal :- Flash section val which has header | 4268 | @eFlash2xSectionVal :- Flash section val which has header |
4269 | 4269 | ||
4270 | Return Value :- | 4270 | Return Value :- |
4271 | Sucess :- If Section is present and writable, corrupt the sig and return STATUS_SUCCESS | 4271 | Success :- If Section is present and writable, corrupt the sig and return STATUS_SUCCESS |
4272 | Failure :-Return negative error code | 4272 | Failure :-Return negative error code |
4273 | 4273 | ||
4274 | 4274 | ||
@@ -4301,7 +4301,7 @@ BcmFlash2xWriteSig :-this API is used to Write the sig if requested Section has | |||
4301 | @eFlashSectionVal :- Flash section val which has header | 4301 | @eFlashSectionVal :- Flash section val which has header |
4302 | 4302 | ||
4303 | Return Value :- | 4303 | Return Value :- |
4304 | Sucess :- If Section is present and writable write the sig and return STATUS_SUCCESS | 4304 | Success :- If Section is present and writable write the sig and return STATUS_SUCCESS |
4305 | Failure :-Return negative error code | 4305 | Failure :-Return negative error code |
4306 | 4306 | ||
4307 | **/ | 4307 | **/ |
@@ -4504,7 +4504,7 @@ BcmCopySection :- This API is used to copy the One section in another. Both sect | |||
4504 | in case of numofBytes equal zero complete section will be copied. | 4504 | in case of numofBytes equal zero complete section will be copied. |
4505 | 4505 | ||
4506 | Return Values- | 4506 | Return Values- |
4507 | Sucess : Return STATUS_SUCCESS | 4507 | Success : Return STATUS_SUCCESS |
4508 | Faillure :- return negative error code | 4508 | Faillure :- return negative error code |
4509 | 4509 | ||
4510 | **/ | 4510 | **/ |
@@ -4621,7 +4621,7 @@ SaveHeaderIfPresent :- This API is use to Protect the Header in case of Header S | |||
4621 | @uiOffset :- Flash offset that has to be written. | 4621 | @uiOffset :- Flash offset that has to be written. |
4622 | 4622 | ||
4623 | Return value :- | 4623 | Return value :- |
4624 | Sucess :- On sucess return STATUS_SUCCESS | 4624 | Success :- On success return STATUS_SUCCESS |
4625 | Faillure :- Return negative error code | 4625 | Faillure :- Return negative error code |
4626 | 4626 | ||
4627 | **/ | 4627 | **/ |
@@ -4634,7 +4634,7 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset) | |||
4634 | UINT uiSectAlignAddr = 0; | 4634 | UINT uiSectAlignAddr = 0; |
4635 | UINT sig = 0; | 4635 | UINT sig = 0; |
4636 | 4636 | ||
4637 | //making the offset sector alligned | 4637 | //making the offset sector aligned |
4638 | uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1); | 4638 | uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1); |
4639 | 4639 | ||
4640 | 4640 | ||
@@ -4643,7 +4643,7 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset) | |||
4643 | (uiSectAlignAddr == BcmGetSectionValEndOffset(Adapter,DSD0)- Adapter->uiSectorSize)) | 4643 | (uiSectAlignAddr == BcmGetSectionValEndOffset(Adapter,DSD0)- Adapter->uiSectorSize)) |
4644 | { | 4644 | { |
4645 | 4645 | ||
4646 | //offset from the sector boundry having the header map | 4646 | //offset from the sector boundary having the header map |
4647 | offsetToProtect = Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader % Adapter->uiSectorSize; | 4647 | offsetToProtect = Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader % Adapter->uiSectorSize; |
4648 | HeaderSizeToProtect = sizeof(DSD_HEADER); | 4648 | HeaderSizeToProtect = sizeof(DSD_HEADER); |
4649 | bHasHeader = TRUE ; | 4649 | bHasHeader = TRUE ; |
@@ -4697,7 +4697,7 @@ BcmDoChipSelect : This will selcet the appropriate chip for writing. | |||
4697 | @Adapater :- Bcm Driver Private Data Structure | 4697 | @Adapater :- Bcm Driver Private Data Structure |
4698 | 4698 | ||
4699 | OutPut:- | 4699 | OutPut:- |
4700 | Select the Appropriate chip and retrn status Sucess | 4700 | Select the Appropriate chip and retrn status Success |
4701 | **/ | 4701 | **/ |
4702 | static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset) | 4702 | static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset) |
4703 | { | 4703 | { |
@@ -5086,7 +5086,7 @@ static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect | |||
5086 | { | 5086 | { |
5087 | if(IsSectionWritable(Adapter,eFlash2xSectionVal) != TRUE) | 5087 | if(IsSectionWritable(Adapter,eFlash2xSectionVal) != TRUE) |
5088 | { | 5088 | { |
5089 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Section is not Writable...Hence cant Corrupt signature"); | 5089 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Section is not Writable...Hence can't Corrupt signature"); |
5090 | return SECTOR_IS_NOT_WRITABLE; | 5090 | return SECTOR_IS_NOT_WRITABLE; |
5091 | } | 5091 | } |
5092 | } | 5092 | } |
@@ -5155,7 +5155,7 @@ static INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect | |||
5155 | 5155 | ||
5156 | if(IsSectionWritable(Adapter,eFlash2xSectionVal) != TRUE) | 5156 | if(IsSectionWritable(Adapter,eFlash2xSectionVal) != TRUE) |
5157 | { | 5157 | { |
5158 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Section is not Writable...Hence cant Corrupt signature"); | 5158 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Section is not Writable...Hence can't Corrupt signature"); |
5159 | return SECTOR_IS_NOT_WRITABLE; | 5159 | return SECTOR_IS_NOT_WRITABLE; |
5160 | } | 5160 | } |
5161 | 5161 | ||
diff --git a/drivers/staging/brcm80211/README b/drivers/staging/brcm80211/README index 99e67669f26b..f8facb0786ec 100644 --- a/drivers/staging/brcm80211/README +++ b/drivers/staging/brcm80211/README | |||
@@ -71,7 +71,7 @@ the driver. The devices use a single worldwide regulatory domain, with channels | |||
71 | passive operation. Transmission on those channels is suppressed until | 71 | passive operation. Transmission on those channels is suppressed until |
72 | appropriate other traffic is observed on those channels. | 72 | appropriate other traffic is observed on those channels. |
73 | 73 | ||
74 | Within the driver, we use the ficticious country code "X2" to represent this | 74 | Within the driver, we use the fictitious country code "X2" to represent this |
75 | worldwide regulatory domain. There is currently no interface to configure a | 75 | worldwide regulatory domain. There is currently no interface to configure a |
76 | different domain. | 76 | different domain. |
77 | 77 | ||
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 65313fa0cf4a..71c3571ee143 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | |||
@@ -264,7 +264,7 @@ extern SDIOH_API_RC sdioh_disable_func_intr(void) | |||
264 | } | 264 | } |
265 | #endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */ | 265 | #endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */ |
266 | 266 | ||
267 | /* Configure callback to client when we recieve client interrupt */ | 267 | /* Configure callback to client when we receive client interrupt */ |
268 | extern SDIOH_API_RC | 268 | extern SDIOH_API_RC |
269 | sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh) | 269 | sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh) |
270 | { | 270 | { |
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c index cbfa1c1b7059..1cf6c5dc2bb7 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c | |||
@@ -46,7 +46,7 @@ extern int sdioh_mmc_irq(int irq); | |||
46 | #include <mach/gpio.h> | 46 | #include <mach/gpio.h> |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | /* Customer specific Host GPIO defintion */ | 49 | /* Customer specific Host GPIO definition */ |
50 | static int dhd_oob_gpio_num = -1; /* GG 19 */ | 50 | static int dhd_oob_gpio_num = -1; /* GG 19 */ |
51 | 51 | ||
52 | module_param(dhd_oob_gpio_num, int, 0644); | 52 | module_param(dhd_oob_gpio_num, int, 0644); |
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 02c6d446934c..dd0375793875 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c | |||
@@ -478,7 +478,7 @@ static int dhd_set_suspend(int value, dhd_pub_t *dhd) | |||
478 | dhd_set_packet_filter(1, dhd); | 478 | dhd_set_packet_filter(1, dhd); |
479 | 479 | ||
480 | /* if dtim skip setup as default force it | 480 | /* if dtim skip setup as default force it |
481 | * to wake each thrid dtim | 481 | * to wake each third dtim |
482 | * for better power saving. | 482 | * for better power saving. |
483 | * Note that side effect is chance to miss BC/MC | 483 | * Note that side effect is chance to miss BC/MC |
484 | * packet | 484 | * packet |
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 106627040db0..464f52af1315 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | |||
@@ -3659,7 +3659,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) | |||
3659 | * control pkt receives. | 3659 | * control pkt receives. |
3660 | * Later we use buffer-poll for data as well | 3660 | * Later we use buffer-poll for data as well |
3661 | * as control packets. | 3661 | * as control packets. |
3662 | * This is required becuase dhd receives full | 3662 | * This is required because dhd receives full |
3663 | * frame in gSPI unlike SDIO. | 3663 | * frame in gSPI unlike SDIO. |
3664 | * After the frame is received we have to | 3664 | * After the frame is received we have to |
3665 | * distinguish whether it is data | 3665 | * distinguish whether it is data |
@@ -3744,7 +3744,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) | |||
3744 | bus->dhd->rx_errors++; | 3744 | bus->dhd->rx_errors++; |
3745 | dhd_os_sdunlock_rxq(bus->dhd); | 3745 | dhd_os_sdunlock_rxq(bus->dhd); |
3746 | /* Force retry w/normal header read. | 3746 | /* Force retry w/normal header read. |
3747 | * Don't attemp NAK for | 3747 | * Don't attempt NAK for |
3748 | * gSPI | 3748 | * gSPI |
3749 | */ | 3749 | */ |
3750 | dhdsdio_rxfail(bus, true, | 3750 | dhdsdio_rxfail(bus, true, |
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 774b4e916b29..c1b07ae31674 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | |||
@@ -1079,7 +1079,7 @@ static int ieee_hw_init(struct ieee80211_hw *hw) | |||
1079 | */ | 1079 | */ |
1080 | hw->max_rates = 2; /* Primary rate and 1 fallback rate */ | 1080 | hw->max_rates = 2; /* Primary rate and 1 fallback rate */ |
1081 | 1081 | ||
1082 | hw->channel_change_time = 7 * 1000; /* channel change time is dependant on chip and band */ | 1082 | hw->channel_change_time = 7 * 1000; /* channel change time is dependent on chip and band */ |
1083 | hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); | 1083 | hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); |
1084 | 1084 | ||
1085 | hw->rate_control_algorithm = "minstrel_ht"; | 1085 | hw->rate_control_algorithm = "minstrel_ht"; |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index c6cdcd940956..f00865957881 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | |||
@@ -89,7 +89,7 @@ u32 wl_ampdu_dbg = | |||
89 | /* structure to hold tx fifo information and pre-loading state | 89 | /* structure to hold tx fifo information and pre-loading state |
90 | * counters specific to tx underflows of ampdus | 90 | * counters specific to tx underflows of ampdus |
91 | * some counters might be redundant with the ones in wlc or ampdu structures. | 91 | * some counters might be redundant with the ones in wlc or ampdu structures. |
92 | * This allows to maintain a specific state independantly of | 92 | * This allows to maintain a specific state independently of |
93 | * how often and/or when the wlc counters are updated. | 93 | * how often and/or when the wlc counters are updated. |
94 | */ | 94 | */ |
95 | typedef struct wlc_fifo_info { | 95 | typedef struct wlc_fifo_info { |
@@ -265,7 +265,7 @@ static void scb_ampdu_update_config(struct ampdu_info *ampdu, struct scb *scb) | |||
265 | 265 | ||
266 | scb_ampdu->max_pdu = (u8) ampdu->wlc->pub->tunables->ampdunummpdu; | 266 | scb_ampdu->max_pdu = (u8) ampdu->wlc->pub->tunables->ampdunummpdu; |
267 | 267 | ||
268 | /* go back to legacy size if some preloading is occuring */ | 268 | /* go back to legacy size if some preloading is occurring */ |
269 | for (i = 0; i < NUM_FFPLD_FIFO; i++) { | 269 | for (i = 0; i < NUM_FFPLD_FIFO; i++) { |
270 | if (ampdu->fifo_tb[i].ampdu_pld_size > FFPLD_PLD_INCR) | 270 | if (ampdu->fifo_tb[i].ampdu_pld_size > FFPLD_PLD_INCR) |
271 | scb_ampdu->max_pdu = AMPDU_NUM_MPDU_LEGACY; | 271 | scb_ampdu->max_pdu = AMPDU_NUM_MPDU_LEGACY; |
@@ -406,7 +406,7 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid) | |||
406 | /* | 406 | /* |
407 | compute a new dma xfer rate for max_mpdu @ max mcs. | 407 | compute a new dma xfer rate for max_mpdu @ max mcs. |
408 | This is the minimum dma rate that | 408 | This is the minimum dma rate that |
409 | can acheive no unferflow condition for the current mpdu size. | 409 | can achieve no unferflow condition for the current mpdu size. |
410 | */ | 410 | */ |
411 | /* note : we divide/multiply by 100 to avoid integer overflows */ | 411 | /* note : we divide/multiply by 100 to avoid integer overflows */ |
412 | fifo->dmaxferrate = | 412 | fifo->dmaxferrate = |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index 5a96dc3cdb36..4b6e181c7dc9 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | |||
@@ -1915,7 +1915,7 @@ void wlc_bmac_phy_reset(struct wlc_hw_info *wlc_hw) | |||
1915 | 1915 | ||
1916 | phy_bw_clkbits = wlc_phy_clk_bwbits(wlc_hw->band->pi); | 1916 | phy_bw_clkbits = wlc_phy_clk_bwbits(wlc_hw->band->pi); |
1917 | 1917 | ||
1918 | /* Specfic reset sequence required for NPHY rev 3 and 4 */ | 1918 | /* Specific reset sequence required for NPHY rev 3 and 4 */ |
1919 | if (WLCISNPHY(wlc_hw->band) && NREV_GE(wlc_hw->band->phyrev, 3) && | 1919 | if (WLCISNPHY(wlc_hw->band) && NREV_GE(wlc_hw->band->phyrev, 3) && |
1920 | NREV_LE(wlc_hw->band->phyrev, 4)) { | 1920 | NREV_LE(wlc_hw->band->phyrev, 4)) { |
1921 | /* Set the PHY bandwidth */ | 1921 | /* Set the PHY bandwidth */ |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c index 639b5d7c9603..717fced45801 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c | |||
@@ -8295,7 +8295,7 @@ wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, struct wlc_txq_info *q, | |||
8295 | return (q->stopped & prio_mask) == prio_mask; | 8295 | return (q->stopped & prio_mask) == prio_mask; |
8296 | } | 8296 | } |
8297 | 8297 | ||
8298 | /* propogate the flow control to all interfaces using the given tx queue */ | 8298 | /* propagate the flow control to all interfaces using the given tx queue */ |
8299 | void wlc_txflowcontrol(struct wlc_info *wlc, struct wlc_txq_info *qi, | 8299 | void wlc_txflowcontrol(struct wlc_info *wlc, struct wlc_txq_info *qi, |
8300 | bool on, int prio) | 8300 | bool on, int prio) |
8301 | { | 8301 | { |
@@ -8462,7 +8462,7 @@ static void wlc_txq_free(struct wlc_info *wlc, struct wlc_txq_info *qi) | |||
8462 | } | 8462 | } |
8463 | 8463 | ||
8464 | /* | 8464 | /* |
8465 | * Flag 'scan in progress' to withold dynamic phy calibration | 8465 | * Flag 'scan in progress' to withhold dynamic phy calibration |
8466 | */ | 8466 | */ |
8467 | void wlc_scan_start(struct wlc_info *wlc) | 8467 | void wlc_scan_start(struct wlc_info *wlc) |
8468 | { | 8468 | { |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c index 0cfa36023cf1..d284f1ac49cc 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c | |||
@@ -332,7 +332,7 @@ wlc_rate_hwrs_filter_sort_validate(wlc_rateset_t *rs, | |||
332 | return false; | 332 | return false; |
333 | } | 333 | } |
334 | 334 | ||
335 | /* caluclate the rate of a rx'd frame and return it as a ratespec */ | 335 | /* calculate the rate of a rx'd frame and return it as a ratespec */ |
336 | ratespec_t BCMFASTPATH wlc_compute_rspec(d11rxhdr_t *rxh, u8 *plcp) | 336 | ratespec_t BCMFASTPATH wlc_compute_rspec(d11rxhdr_t *rxh, u8 *plcp) |
337 | { | 337 | { |
338 | int phy_type; | 338 | int phy_type; |
diff --git a/drivers/staging/brcm80211/include/bcmsrom_fmt.h b/drivers/staging/brcm80211/include/bcmsrom_fmt.h index ae2bff828607..4768968f910a 100644 --- a/drivers/staging/brcm80211/include/bcmsrom_fmt.h +++ b/drivers/staging/brcm80211/include/bcmsrom_fmt.h | |||
@@ -103,7 +103,7 @@ | |||
103 | 103 | ||
104 | #define SROM_CRCREV 63 | 104 | #define SROM_CRCREV 63 |
105 | 105 | ||
106 | /* SROM Rev 4: Reallocate the software part of the srom to accomodate | 106 | /* SROM Rev 4: Reallocate the software part of the srom to accommodate |
107 | * MIMO features. It assumes up to two PCIE functions and 440 bytes | 107 | * MIMO features. It assumes up to two PCIE functions and 440 bytes |
108 | * of useable srom i.e. the useable storage in chips with OTP that | 108 | * of useable srom i.e. the useable storage in chips with OTP that |
109 | * implements hardware redundancy. | 109 | * implements hardware redundancy. |
diff --git a/drivers/staging/brcm80211/include/hndsoc.h b/drivers/staging/brcm80211/include/hndsoc.h index 9747cc46ca96..6435686b329f 100644 --- a/drivers/staging/brcm80211/include/hndsoc.h +++ b/drivers/staging/brcm80211/include/hndsoc.h | |||
@@ -181,7 +181,7 @@ | |||
181 | * conventions for the use the flash space: | 181 | * conventions for the use the flash space: |
182 | */ | 182 | */ |
183 | 183 | ||
184 | /* Minumum amount of flash we support */ | 184 | /* Minimum amount of flash we support */ |
185 | #define FLASH_MIN 0x00020000 /* Minimum flash size */ | 185 | #define FLASH_MIN 0x00020000 /* Minimum flash size */ |
186 | 186 | ||
187 | /* A boot/binary may have an embedded block that describes its size */ | 187 | /* A boot/binary may have an embedded block that describes its size */ |
diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c index ba71c108b366..17991212a22d 100644 --- a/drivers/staging/brcm80211/util/bcmotp.c +++ b/drivers/staging/brcm80211/util/bcmotp.c | |||
@@ -213,7 +213,7 @@ static u16 ipxotp_read_bit(void *oh, chipcregs_t *cc, uint off) | |||
213 | return (int)st; | 213 | return (int)st; |
214 | } | 214 | } |
215 | 215 | ||
216 | /* Calculate max HW/SW region byte size by substracting fuse region and checksum size, | 216 | /* Calculate max HW/SW region byte size by subtracting fuse region and checksum size, |
217 | * osizew is oi->wsize (OTP size - GU size) in words | 217 | * osizew is oi->wsize (OTP size - GU size) in words |
218 | */ | 218 | */ |
219 | static int ipxotp_max_rgnsz(si_t *sih, int osizew) | 219 | static int ipxotp_max_rgnsz(si_t *sih, int osizew) |
@@ -229,7 +229,7 @@ static int ipxotp_max_rgnsz(si_t *sih, int osizew) | |||
229 | ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM; | 229 | ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM; |
230 | break; | 230 | break; |
231 | default: | 231 | default: |
232 | ASSERT(0); /* Don't konw about this chip */ | 232 | ASSERT(0); /* Don't know about this chip */ |
233 | } | 233 | } |
234 | 234 | ||
235 | return ret; | 235 | return ret; |
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c index eca35b94e96c..850bfa6593e0 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/drivers/staging/brcm80211/util/bcmsrom.c | |||
@@ -1859,7 +1859,7 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count) | |||
1859 | 1859 | ||
1860 | /* | 1860 | /* |
1861 | * Apply CRC over SROM content regardless SROM is present or not, | 1861 | * Apply CRC over SROM content regardless SROM is present or not, |
1862 | * and use variable <devpath>sromrev's existance in flash to decide | 1862 | * and use variable <devpath>sromrev's existence in flash to decide |
1863 | * if we should return an error when CRC fails or read SROM variables | 1863 | * if we should return an error when CRC fails or read SROM variables |
1864 | * from flash. | 1864 | * from flash. |
1865 | */ | 1865 | */ |
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c index 8a81eb997f99..be339feae77d 100644 --- a/drivers/staging/brcm80211/util/hnddma.c +++ b/drivers/staging/brcm80211/util/hnddma.c | |||
@@ -1179,7 +1179,7 @@ static void BCMFASTPATH dma64_txreclaim(dma_info_t *di, txd_range_t range) | |||
1179 | (range == HNDDMA_RANGE_ALL) ? "all" : | 1179 | (range == HNDDMA_RANGE_ALL) ? "all" : |
1180 | ((range == | 1180 | ((range == |
1181 | HNDDMA_RANGE_TRANSMITTED) ? "transmitted" : | 1181 | HNDDMA_RANGE_TRANSMITTED) ? "transmitted" : |
1182 | "transfered"))); | 1182 | "transferred"))); |
1183 | 1183 | ||
1184 | if (di->txin == di->txout) | 1184 | if (di->txin == di->txout) |
1185 | return; | 1185 | return; |
@@ -1549,7 +1549,7 @@ static int BCMFASTPATH dma64_txfast(dma_info_t *di, struct sk_buff *p0, | |||
1549 | * If range is HNDDMA_RANGE_TRANSMITTED, reclaim descriptors that have be | 1549 | * If range is HNDDMA_RANGE_TRANSMITTED, reclaim descriptors that have be |
1550 | * transmitted as noted by the hardware "CurrDescr" pointer. | 1550 | * transmitted as noted by the hardware "CurrDescr" pointer. |
1551 | * If range is HNDDMA_RANGE_TRANSFERED, reclaim descriptors that have be | 1551 | * If range is HNDDMA_RANGE_TRANSFERED, reclaim descriptors that have be |
1552 | * transfered by the DMA as noted by the hardware "ActiveDescr" pointer. | 1552 | * transferred by the DMA as noted by the hardware "ActiveDescr" pointer. |
1553 | * If range is HNDDMA_RANGE_ALL, reclaim all txd(s) posted to the ring and | 1553 | * If range is HNDDMA_RANGE_ALL, reclaim all txd(s) posted to the ring and |
1554 | * return associated packet regardless of the value of hardware pointers. | 1554 | * return associated packet regardless of the value of hardware pointers. |
1555 | */ | 1555 | */ |
@@ -1563,7 +1563,7 @@ static void *BCMFASTPATH dma64_getnexttxp(dma_info_t *di, txd_range_t range) | |||
1563 | (range == HNDDMA_RANGE_ALL) ? "all" : | 1563 | (range == HNDDMA_RANGE_ALL) ? "all" : |
1564 | ((range == | 1564 | ((range == |
1565 | HNDDMA_RANGE_TRANSMITTED) ? "transmitted" : | 1565 | HNDDMA_RANGE_TRANSMITTED) ? "transmitted" : |
1566 | "transfered"))); | 1566 | "transferred"))); |
1567 | 1567 | ||
1568 | if (di->ntxd == 0) | 1568 | if (di->ntxd == 0) |
1569 | return NULL; | 1569 | return NULL; |
diff --git a/drivers/staging/brcm80211/util/sbpcmcia.h b/drivers/staging/brcm80211/util/sbpcmcia.h index 6b9923f551a9..d4c156586e81 100644 --- a/drivers/staging/brcm80211/util/sbpcmcia.h +++ b/drivers/staging/brcm80211/util/sbpcmcia.h | |||
@@ -109,7 +109,7 @@ | |||
109 | #define CISTPL_CFTABLE 0x1b /* Config table entry */ | 109 | #define CISTPL_CFTABLE 0x1b /* Config table entry */ |
110 | #define CISTPL_END 0xff /* End of the CIS tuple chain */ | 110 | #define CISTPL_END 0xff /* End of the CIS tuple chain */ |
111 | 111 | ||
112 | /* Function identifier provides context for the function extentions tuple */ | 112 | /* Function identifier provides context for the function extensions tuple */ |
113 | #define CISTPL_FID_SDIO 0x0c /* Extensions defined by SDIO spec */ | 113 | #define CISTPL_FID_SDIO 0x0c /* Extensions defined by SDIO spec */ |
114 | 114 | ||
115 | /* Function extensions for LANs (assumed for extensions other than SDIO) */ | 115 | /* Function extensions for LANs (assumed for extensions other than SDIO) */ |
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c index ed168ceba5f0..6ebd7f58af81 100644 --- a/drivers/staging/brcm80211/util/siutils.c +++ b/drivers/staging/brcm80211/util/siutils.c | |||
@@ -1319,7 +1319,7 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on) | |||
1319 | } | 1319 | } |
1320 | 1320 | ||
1321 | /* | 1321 | /* |
1322 | * clock control policy function throught chipcommon | 1322 | * clock control policy function through chipcommon |
1323 | * | 1323 | * |
1324 | * set dynamic clk control mode (forceslow, forcefast, dynamic) | 1324 | * set dynamic clk control mode (forceslow, forcefast, dynamic) |
1325 | * returns true if we are forcing fast clock | 1325 | * returns true if we are forcing fast clock |
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index a4ceb29c358e..e7e72b8d8cde 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c | |||
@@ -2064,7 +2064,7 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s) | |||
2064 | COMEDI_CB_OVERFLOW)) { | 2064 | COMEDI_CB_OVERFLOW)) { |
2065 | runflags_mask |= SRF_RUNNING; | 2065 | runflags_mask |= SRF_RUNNING; |
2066 | } | 2066 | } |
2067 | /* remember if an error event has occured, so an error | 2067 | /* remember if an error event has occurred, so an error |
2068 | * can be returned the next time the user does a read() */ | 2068 | * can be returned the next time the user does a read() */ |
2069 | if (s->async->events & (COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) { | 2069 | if (s->async->events & (COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) { |
2070 | runflags_mask |= SRF_ERROR; | 2070 | runflags_mask |= SRF_ERROR; |
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c index 644bda44556e..482a412aa652 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c | |||
@@ -124,9 +124,9 @@ You should also find the complete GPL in the COPYING file accompanying this sour | |||
124 | | -5: The selected PCI input clock is wrong | | 124 | | -5: The selected PCI input clock is wrong | |
125 | | -6: Timing unity selection is wrong | | 125 | | -6: Timing unity selection is wrong | |
126 | | -7: Base timing selection is wrong | | 126 | | -7: Base timing selection is wrong | |
127 | | -8: You can not used the 40MHz clock selection wich | | 127 | | -8: You can not used the 40MHz clock selection with | |
128 | | this board | | 128 | | this board | |
129 | | -9: You can not used the 40MHz clock selection wich | | 129 | | -9: You can not used the 40MHz clock selection with | |
130 | | this CHRONOS version | | 130 | | this CHRONOS version | |
131 | +----------------------------------------------------------------------------+ | 131 | +----------------------------------------------------------------------------+ |
132 | */ | 132 | */ |
@@ -721,10 +721,10 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_sub | |||
721 | } | 721 | } |
722 | } else { | 722 | } else { |
723 | /**************************************************************/ | 723 | /**************************************************************/ |
724 | /* You can not used the 40MHz clock selection wich this board */ | 724 | /* You can not use the 40MHz clock selection with this board */ |
725 | /**************************************************************/ | 725 | /**************************************************************/ |
726 | 726 | ||
727 | DPRINTK("You can not used the 40MHz clock selection wich this board\n"); | 727 | DPRINTK("You can not used the 40MHz clock selection with this board\n"); |
728 | i_ReturnValue = | 728 | i_ReturnValue = |
729 | -8; | 729 | -8; |
730 | } | 730 | } |
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c index 90e71e12784a..b973095146f9 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c | |||
@@ -59,7 +59,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour | |||
59 | /*+----------------------------------------------------------------------------+*/ | 59 | /*+----------------------------------------------------------------------------+*/ |
60 | /*| Input Parameters : int i_NbOfWordsToRead : Nbr. of word to read |*/ | 60 | /*| Input Parameters : int i_NbOfWordsToRead : Nbr. of word to read |*/ |
61 | /*| unsigned int dw_PCIBoardEepromAddress : Address of the eeprom |*/ | 61 | /*| unsigned int dw_PCIBoardEepromAddress : Address of the eeprom |*/ |
62 | /*| unsigned short w_EepromStartAddress : Eeprom strat address |*/ | 62 | /*| unsigned short w_EepromStartAddress : Eeprom start address |*/ |
63 | /*+----------------------------------------------------------------------------+*/ | 63 | /*+----------------------------------------------------------------------------+*/ |
64 | /*| Output Parameters : unsigned short * pw_DataRead : Read data |*/ | 64 | /*| Output Parameters : unsigned short * pw_DataRead : Read data |*/ |
65 | /*+----------------------------------------------------------------------------+*/ | 65 | /*+----------------------------------------------------------------------------+*/ |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c index 9dd857df93c8..002297dfe33f 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c | |||
@@ -498,7 +498,7 @@ void v_APCI2032_Interrupt(int irq, void *d) | |||
498 | struct comedi_device *dev = d; | 498 | struct comedi_device *dev = d; |
499 | unsigned int ui_DO; | 499 | unsigned int ui_DO; |
500 | 500 | ||
501 | ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1; /* Check if VCC OR CC interrupt has occured. */ | 501 | ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1; /* Check if VCC OR CC interrupt has occurred. */ |
502 | 502 | ||
503 | if (ui_DO == 0) { | 503 | if (ui_DO == 0) { |
504 | printk("\nInterrupt from unKnown source\n"); | 504 | printk("\nInterrupt from unKnown source\n"); |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index a813fdbbd96e..fc61214151b7 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | |||
@@ -148,7 +148,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd | |||
148 | unsigned short us_ConvertTiming, us_TmpValue, i; | 148 | unsigned short us_ConvertTiming, us_TmpValue, i; |
149 | unsigned char b_Tmp; | 149 | unsigned char b_Tmp; |
150 | 150 | ||
151 | /* fix convertion time to 10 us */ | 151 | /* fix conversion time to 10 us */ |
152 | if (!devpriv->ui_EocEosConversionTime) { | 152 | if (!devpriv->ui_EocEosConversionTime) { |
153 | printk("No timer0 Value using 10 us\n"); | 153 | printk("No timer0 Value using 10 us\n"); |
154 | us_ConvertTiming = 10; | 154 | us_ConvertTiming = 10; |
@@ -251,7 +251,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd | |||
251 | APCI3120_SELECT_TIMER_0_WORD; | 251 | APCI3120_SELECT_TIMER_0_WORD; |
252 | outb(b_Tmp, devpriv->iobase + APCI3120_TIMER_CRT0); | 252 | outb(b_Tmp, devpriv->iobase + APCI3120_TIMER_CRT0); |
253 | 253 | ||
254 | /* Set the convertion time */ | 254 | /* Set the conversion time */ |
255 | outw(us_ConvertTiming, | 255 | outw(us_ConvertTiming, |
256 | devpriv->iobase + APCI3120_TIMER_VALUE); | 256 | devpriv->iobase + APCI3120_TIMER_VALUE); |
257 | 257 | ||
@@ -311,7 +311,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd | |||
311 | APCI3120_SELECT_TIMER_0_WORD; | 311 | APCI3120_SELECT_TIMER_0_WORD; |
312 | outb(b_Tmp, devpriv->iobase + APCI3120_TIMER_CRT0); | 312 | outb(b_Tmp, devpriv->iobase + APCI3120_TIMER_CRT0); |
313 | 313 | ||
314 | /* Set the convertion time */ | 314 | /* Set the conversion time */ |
315 | outw(us_ConvertTiming, | 315 | outw(us_ConvertTiming, |
316 | devpriv->iobase + APCI3120_TIMER_VALUE); | 316 | devpriv->iobase + APCI3120_TIMER_VALUE); |
317 | 317 | ||
@@ -354,9 +354,9 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd | |||
354 | /* Start conversion */ | 354 | /* Start conversion */ |
355 | outw(0, devpriv->iobase + APCI3120_START_CONVERSION); | 355 | outw(0, devpriv->iobase + APCI3120_START_CONVERSION); |
356 | 356 | ||
357 | /* Waiting of end of convertion if interrupt is not installed */ | 357 | /* Waiting of end of conversion if interrupt is not installed */ |
358 | if (devpriv->b_EocEosInterrupt == APCI3120_DISABLE) { | 358 | if (devpriv->b_EocEosInterrupt == APCI3120_DISABLE) { |
359 | /* Waiting the end of convertion */ | 359 | /* Waiting the end of conversion */ |
360 | do { | 360 | do { |
361 | us_TmpValue = | 361 | us_TmpValue = |
362 | inw(devpriv->iobase + | 362 | inw(devpriv->iobase + |
@@ -854,7 +854,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev, | |||
854 | b_DigitalOutputRegister) & 0xF0) | | 854 | b_DigitalOutputRegister) & 0xF0) | |
855 | APCI3120_SELECT_TIMER_0_WORD; | 855 | APCI3120_SELECT_TIMER_0_WORD; |
856 | outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); | 856 | outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); |
857 | /* Set the convertion time */ | 857 | /* Set the conversion time */ |
858 | outw(((unsigned short) ui_TimerValue0), | 858 | outw(((unsigned short) ui_TimerValue0), |
859 | dev->iobase + APCI3120_TIMER_VALUE); | 859 | dev->iobase + APCI3120_TIMER_VALUE); |
860 | break; | 860 | break; |
@@ -872,7 +872,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev, | |||
872 | b_DigitalOutputRegister) & 0xF0) | | 872 | b_DigitalOutputRegister) & 0xF0) | |
873 | APCI3120_SELECT_TIMER_1_WORD; | 873 | APCI3120_SELECT_TIMER_1_WORD; |
874 | outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); | 874 | outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); |
875 | /* Set the convertion time */ | 875 | /* Set the conversion time */ |
876 | outw(((unsigned short) ui_TimerValue1), | 876 | outw(((unsigned short) ui_TimerValue1), |
877 | dev->iobase + APCI3120_TIMER_VALUE); | 877 | dev->iobase + APCI3120_TIMER_VALUE); |
878 | 878 | ||
@@ -889,7 +889,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev, | |||
889 | APCI3120_SELECT_TIMER_0_WORD; | 889 | APCI3120_SELECT_TIMER_0_WORD; |
890 | outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); | 890 | outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); |
891 | 891 | ||
892 | /* Set the convertion time */ | 892 | /* Set the conversion time */ |
893 | outw(((unsigned short) ui_TimerValue0), | 893 | outw(((unsigned short) ui_TimerValue0), |
894 | dev->iobase + APCI3120_TIMER_VALUE); | 894 | dev->iobase + APCI3120_TIMER_VALUE); |
895 | break; | 895 | break; |
@@ -1104,7 +1104,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev, | |||
1104 | 1104 | ||
1105 | /* | 1105 | /* |
1106 | * 4 | 1106 | * 4 |
1107 | * amount of bytes to be transfered set transfer count used ADDON | 1107 | * amount of bytes to be transferred set transfer count used ADDON |
1108 | * MWTC register commented testing | 1108 | * MWTC register commented testing |
1109 | * outl(devpriv->ui_DmaBufferUsesize[0], | 1109 | * outl(devpriv->ui_DmaBufferUsesize[0], |
1110 | * devpriv->i_IobaseAddon+AMCC_OP_REG_AMWTC); | 1110 | * devpriv->i_IobaseAddon+AMCC_OP_REG_AMWTC); |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h index b3c81979f14d..50eb0a0a0a05 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h | |||
@@ -169,7 +169,7 @@ struct str_AnalogReadInformation { | |||
169 | 169 | ||
170 | unsigned char b_Type; /* EOC or EOS */ | 170 | unsigned char b_Type; /* EOC or EOS */ |
171 | unsigned char b_InterruptFlag; /* Interrupt use or not */ | 171 | unsigned char b_InterruptFlag; /* Interrupt use or not */ |
172 | unsigned int ui_ConvertTiming; /* Selection of the convertion time */ | 172 | unsigned int ui_ConvertTiming; /* Selection of the conversion time */ |
173 | unsigned char b_NbrOfChannel; /* Number of channel to read */ | 173 | unsigned char b_NbrOfChannel; /* Number of channel to read */ |
174 | unsigned int ui_ChannelList[MAX_ANALOGINPUT_CHANNELS]; /* Number of the channel to be read */ | 174 | unsigned int ui_ChannelList[MAX_ANALOGINPUT_CHANNELS]; /* Number of the channel to be read */ |
175 | unsigned int ui_RangeList[MAX_ANALOGINPUT_CHANNELS]; /* Gain of each channel */ | 175 | unsigned int ui_RangeList[MAX_ANALOGINPUT_CHANNELS]; /* Gain of each channel */ |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c index a93e2349ad3a..c75a1a1fd775 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c | |||
@@ -103,7 +103,7 @@ struct str_BoardInfos s_BoardInfos[100]; /* 100 will be the max number of board | |||
103 | /*+----------------------------------------------------------------------------+*/ | 103 | /*+----------------------------------------------------------------------------+*/ |
104 | /*| Input Parameters : int i_NbOfWordsToRead : Nbr. of word to read |*/ | 104 | /*| Input Parameters : int i_NbOfWordsToRead : Nbr. of word to read |*/ |
105 | /*| unsigned int dw_PCIBoardEepromAddress : Address of the eeprom |*/ | 105 | /*| unsigned int dw_PCIBoardEepromAddress : Address of the eeprom |*/ |
106 | /*| unsigned short w_EepromStartAddress : Eeprom strat address |*/ | 106 | /*| unsigned short w_EepromStartAddress : Eeprom start address |*/ |
107 | /*+----------------------------------------------------------------------------+*/ | 107 | /*+----------------------------------------------------------------------------+*/ |
108 | /*| Output Parameters : unsigned short * pw_DataRead : Read data |*/ | 108 | /*| Output Parameters : unsigned short * pw_DataRead : Read data |*/ |
109 | /*+----------------------------------------------------------------------------+*/ | 109 | /*+----------------------------------------------------------------------------+*/ |
@@ -849,7 +849,7 @@ int i_APCI3200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev | |||
849 | | 0:Single Read | 849 | | 0:Single Read |
850 | | 1:Read more channel | 850 | | 1:Read more channel |
851 | 2:Single scan | 851 | 2:Single scan |
852 | | 3:Continous Scan | 852 | | 3:Continuous Scan |
853 | data[13] :Number of channels to read | 853 | data[13] :Number of channels to read |
854 | | data[14] :RTD connection type | 854 | | data[14] :RTD connection type |
855 | :0:RTD not used | 855 | :0:RTD not used |
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 766103c882ad..632d5d0721cd 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c | |||
@@ -23,7 +23,7 @@ For AI: | |||
23 | - If cmd->scan_begin_src=TRIG_EXT then trigger input is TGIN (pin 46). | 23 | - If cmd->scan_begin_src=TRIG_EXT then trigger input is TGIN (pin 46). |
24 | - If cmd->convert_src=TRIG_EXT then trigger input is EXTTRG (pin 44). | 24 | - If cmd->convert_src=TRIG_EXT then trigger input is EXTTRG (pin 44). |
25 | - If cmd->start_src/stop_src=TRIG_EXT then trigger input is TGIN (pin 46). | 25 | - If cmd->start_src/stop_src=TRIG_EXT then trigger input is TGIN (pin 46). |
26 | - It is not neccessary to have cmd.scan_end_arg=cmd.chanlist_len but | 26 | - It is not necessary to have cmd.scan_end_arg=cmd.chanlist_len but |
27 | cmd.scan_end_arg modulo cmd.chanlist_len must by 0. | 27 | cmd.scan_end_arg modulo cmd.chanlist_len must by 0. |
28 | - If return value of cmdtest is 5 then you've bad channel list | 28 | - If return value of cmdtest is 5 then you've bad channel list |
29 | (it isn't possible mixture S.E. and DIFF inputs or bipolar and unipolar | 29 | (it isn't possible mixture S.E. and DIFF inputs or bipolar and unipolar |
@@ -823,7 +823,7 @@ static void interrupt_pci9118_ai_dma(struct comedi_device *dev, | |||
823 | move_block_from_dma(dev, s, | 823 | move_block_from_dma(dev, s, |
824 | devpriv->dmabuf_virt[devpriv->dma_actbuf], | 824 | devpriv->dmabuf_virt[devpriv->dma_actbuf], |
825 | samplesinbuf); | 825 | samplesinbuf); |
826 | m = m - sampls; /* m= how many samples was transfered */ | 826 | m = m - sampls; /* m= how many samples was transferred */ |
827 | } | 827 | } |
828 | /* DPRINTK("YYY\n"); */ | 828 | /* DPRINTK("YYY\n"); */ |
829 | 829 | ||
@@ -1297,7 +1297,7 @@ static int Compute_and_setup_dma(struct comedi_device *dev) | |||
1297 | DPRINTK("3 dmalen0=%d dmalen1=%d\n", dmalen0, dmalen1); | 1297 | DPRINTK("3 dmalen0=%d dmalen1=%d\n", dmalen0, dmalen1); |
1298 | /* transfer without TRIG_WAKE_EOS */ | 1298 | /* transfer without TRIG_WAKE_EOS */ |
1299 | if (!(devpriv->ai_flags & TRIG_WAKE_EOS)) { | 1299 | if (!(devpriv->ai_flags & TRIG_WAKE_EOS)) { |
1300 | /* if it's possible then allign DMA buffers to length of scan */ | 1300 | /* if it's possible then align DMA buffers to length of scan */ |
1301 | i = dmalen0; | 1301 | i = dmalen0; |
1302 | dmalen0 = | 1302 | dmalen0 = |
1303 | (dmalen0 / (devpriv->ai_n_realscanlen << 1)) * | 1303 | (dmalen0 / (devpriv->ai_n_realscanlen << 1)) * |
diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c index 4b470000b69c..5361f318b010 100644 --- a/drivers/staging/comedi/drivers/adq12b.c +++ b/drivers/staging/comedi/drivers/adq12b.c | |||
@@ -65,7 +65,7 @@ If you do not specify any options, they will default to | |||
65 | written by jeremy theler <thelerg@ib.cnea.gov.ar> | 65 | written by jeremy theler <thelerg@ib.cnea.gov.ar> |
66 | 66 | ||
67 | instituto balseiro | 67 | instituto balseiro |
68 | comision nacional de energia atomica | 68 | commission nacional de energia atomica |
69 | universidad nacional de cuyo | 69 | universidad nacional de cuyo |
70 | argentina | 70 | argentina |
71 | 71 | ||
@@ -342,7 +342,7 @@ static int adq12b_ai_rinsn(struct comedi_device *dev, | |||
342 | /* convert n samples */ | 342 | /* convert n samples */ |
343 | for (n = 0; n < insn->n; n++) { | 343 | for (n = 0; n < insn->n; n++) { |
344 | 344 | ||
345 | /* wait for end of convertion */ | 345 | /* wait for end of conversion */ |
346 | i = 0; | 346 | i = 0; |
347 | do { | 347 | do { |
348 | /* udelay(1); */ | 348 | /* udelay(1); */ |
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 466e69f94ef2..da2b75b15d4e 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c | |||
@@ -98,7 +98,7 @@ Configuration options: | |||
98 | #define Status_FE 0x0100 /* 1=FIFO is empty */ | 98 | #define Status_FE 0x0100 /* 1=FIFO is empty */ |
99 | #define Status_FH 0x0200 /* 1=FIFO is half full */ | 99 | #define Status_FH 0x0200 /* 1=FIFO is half full */ |
100 | #define Status_FF 0x0400 /* 1=FIFO is full, fatal error */ | 100 | #define Status_FF 0x0400 /* 1=FIFO is full, fatal error */ |
101 | #define Status_IRQ 0x0800 /* 1=IRQ occured */ | 101 | #define Status_IRQ 0x0800 /* 1=IRQ occurred */ |
102 | /* bits from control register (PCI171x_CONTROL) */ | 102 | /* bits from control register (PCI171x_CONTROL) */ |
103 | #define Control_CNT0 0x0040 /* 1=CNT0 have external source, | 103 | #define Control_CNT0 0x0040 /* 1=CNT0 have external source, |
104 | * 0=have internal 100kHz source */ | 104 | * 0=have internal 100kHz source */ |
@@ -1161,7 +1161,7 @@ static int check_channel_list(struct comedi_device *dev, | |||
1161 | } | 1161 | } |
1162 | 1162 | ||
1163 | if (n_chan > 1) { | 1163 | if (n_chan > 1) { |
1164 | chansegment[0] = chanlist[0]; /* first channel is everytime ok */ | 1164 | chansegment[0] = chanlist[0]; /* first channel is every time ok */ |
1165 | for (i = 1, seglen = 1; i < n_chan; i++, seglen++) { /* build part of chanlist */ | 1165 | for (i = 1, seglen = 1; i < n_chan; i++, seglen++) { /* build part of chanlist */ |
1166 | /* printk("%d. %d %d\n",i,CR_CHAN(chanlist[i]),CR_RANGE(chanlist[i])); */ | 1166 | /* printk("%d. %d %d\n",i,CR_CHAN(chanlist[i]),CR_RANGE(chanlist[i])); */ |
1167 | if (chanlist[0] == chanlist[i]) | 1167 | if (chanlist[0] == chanlist[i]) |
@@ -1176,9 +1176,9 @@ static int check_channel_list(struct comedi_device *dev, | |||
1176 | (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan; | 1176 | (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan; |
1177 | if (CR_AREF(chansegment[i - 1]) == AREF_DIFF) | 1177 | if (CR_AREF(chansegment[i - 1]) == AREF_DIFF) |
1178 | nowmustbechan = (nowmustbechan + 1) % s->n_chan; | 1178 | nowmustbechan = (nowmustbechan + 1) % s->n_chan; |
1179 | if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continous :-( */ | 1179 | if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continuous :-( */ |
1180 | printk | 1180 | printk |
1181 | ("channel list must be continous! chanlist[%i]=%d but must be %d or %d!\n", | 1181 | ("channel list must be continuous! chanlist[%i]=%d but must be %d or %d!\n", |
1182 | i, CR_CHAN(chanlist[i]), nowmustbechan, | 1182 | i, CR_CHAN(chanlist[i]), nowmustbechan, |
1183 | CR_CHAN(chanlist[0])); | 1183 | CR_CHAN(chanlist[0])); |
1184 | return 0; | 1184 | return 0; |
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index 0941643b3869..61968a505f24 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c | |||
@@ -115,7 +115,7 @@ analog triggering on 1602 series | |||
115 | #define INT_MASK 0x3 /* mask of interrupt select bits */ | 115 | #define INT_MASK 0x3 /* mask of interrupt select bits */ |
116 | #define INTE 0x4 /* interrupt enable */ | 116 | #define INTE 0x4 /* interrupt enable */ |
117 | #define DAHFIE 0x8 /* dac half full interrupt enable */ | 117 | #define DAHFIE 0x8 /* dac half full interrupt enable */ |
118 | #define EOAIE 0x10 /* end of aquisition interrupt enable */ | 118 | #define EOAIE 0x10 /* end of acquisition interrupt enable */ |
119 | #define DAHFI 0x20 /* dac half full read status / write interrupt clear */ | 119 | #define DAHFI 0x20 /* dac half full read status / write interrupt clear */ |
120 | #define EOAI 0x40 /* read end of acq. interrupt status / write clear */ | 120 | #define EOAI 0x40 /* read end of acq. interrupt status / write clear */ |
121 | #define INT 0x80 /* read interrupt status / write clear */ | 121 | #define INT 0x80 /* read interrupt status / write clear */ |
@@ -440,7 +440,7 @@ struct cb_pcidas_private { | |||
440 | unsigned int divisor1; | 440 | unsigned int divisor1; |
441 | unsigned int divisor2; | 441 | unsigned int divisor2; |
442 | volatile unsigned int count; /* number of analog input samples remaining */ | 442 | volatile unsigned int count; /* number of analog input samples remaining */ |
443 | volatile unsigned int adc_fifo_bits; /* bits to write to interupt/adcfifo register */ | 443 | volatile unsigned int adc_fifo_bits; /* bits to write to interrupt/adcfifo register */ |
444 | volatile unsigned int s5933_intcsr_bits; /* bits to write to amcc s5933 interrupt control/status register */ | 444 | volatile unsigned int s5933_intcsr_bits; /* bits to write to amcc s5933 interrupt control/status register */ |
445 | volatile unsigned int ao_control_bits; /* bits to write to ao control and status register */ | 445 | volatile unsigned int ao_control_bits; /* bits to write to ao control and status register */ |
446 | short ai_buffer[AI_BUFFER_SIZE]; | 446 | short ai_buffer[AI_BUFFER_SIZE]; |
@@ -1653,7 +1653,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d) | |||
1653 | spin_unlock_irqrestore(&dev->spinlock, flags); | 1653 | spin_unlock_irqrestore(&dev->spinlock, flags); |
1654 | } else if (status & EOAI) { | 1654 | } else if (status & EOAI) { |
1655 | comedi_error(dev, | 1655 | comedi_error(dev, |
1656 | "bug! encountered end of aquisition interrupt?"); | 1656 | "bug! encountered end of acquisition interrupt?"); |
1657 | /* clear EOA interrupt latch */ | 1657 | /* clear EOA interrupt latch */ |
1658 | spin_lock_irqsave(&dev->spinlock, flags); | 1658 | spin_lock_irqsave(&dev->spinlock, flags); |
1659 | outw(devpriv->adc_fifo_bits | EOAI, | 1659 | outw(devpriv->adc_fifo_bits | EOAI, |
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 2583e16cd02a..1e324198996c 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c | |||
@@ -104,7 +104,7 @@ TODO: | |||
104 | #endif | 104 | #endif |
105 | 105 | ||
106 | #define TIMER_BASE 25 /* 40MHz master clock */ | 106 | #define TIMER_BASE 25 /* 40MHz master clock */ |
107 | #define PRESCALED_TIMER_BASE 10000 /* 100kHz 'prescaled' clock for slow aquisition, maybe I'll support this someday */ | 107 | #define PRESCALED_TIMER_BASE 10000 /* 100kHz 'prescaled' clock for slow acquisition, maybe I'll support this someday */ |
108 | #define DMA_BUFFER_SIZE 0x1000 | 108 | #define DMA_BUFFER_SIZE 0x1000 |
109 | 109 | ||
110 | #define PCI_VENDOR_ID_COMPUTERBOARDS 0x1307 | 110 | #define PCI_VENDOR_ID_COMPUTERBOARDS 0x1307 |
@@ -136,7 +136,7 @@ enum write_only_registers { | |||
136 | ADC_DELAY_INTERVAL_UPPER_REG = 0x1c, /* upper 8 bits of delay interval counter */ | 136 | ADC_DELAY_INTERVAL_UPPER_REG = 0x1c, /* upper 8 bits of delay interval counter */ |
137 | ADC_COUNT_LOWER_REG = 0x1e, /* lower 16 bits of hardware conversion/scan counter */ | 137 | ADC_COUNT_LOWER_REG = 0x1e, /* lower 16 bits of hardware conversion/scan counter */ |
138 | ADC_COUNT_UPPER_REG = 0x20, /* upper 8 bits of hardware conversion/scan counter */ | 138 | ADC_COUNT_UPPER_REG = 0x20, /* upper 8 bits of hardware conversion/scan counter */ |
139 | ADC_START_REG = 0x22, /* software trigger to start aquisition */ | 139 | ADC_START_REG = 0x22, /* software trigger to start acquisition */ |
140 | ADC_CONVERT_REG = 0x24, /* initiates single conversion */ | 140 | ADC_CONVERT_REG = 0x24, /* initiates single conversion */ |
141 | ADC_QUEUE_CLEAR_REG = 0x26, /* clears adc queue */ | 141 | ADC_QUEUE_CLEAR_REG = 0x26, /* clears adc queue */ |
142 | ADC_QUEUE_LOAD_REG = 0x28, /* loads adc queue */ | 142 | ADC_QUEUE_LOAD_REG = 0x28, /* loads adc queue */ |
@@ -199,7 +199,7 @@ enum intr_enable_contents { | |||
199 | ADC_INTR_EOSCAN_BITS = 0x2, /* interrupt end of scan */ | 199 | ADC_INTR_EOSCAN_BITS = 0x2, /* interrupt end of scan */ |
200 | ADC_INTR_EOSEQ_BITS = 0x3, /* interrupt end of sequence (probably wont use this it's pretty fancy) */ | 200 | ADC_INTR_EOSEQ_BITS = 0x3, /* interrupt end of sequence (probably wont use this it's pretty fancy) */ |
201 | EN_ADC_INTR_SRC_BIT = 0x4, /* enable adc interrupt source */ | 201 | EN_ADC_INTR_SRC_BIT = 0x4, /* enable adc interrupt source */ |
202 | EN_ADC_DONE_INTR_BIT = 0x8, /* enable adc aquisition done interrupt */ | 202 | EN_ADC_DONE_INTR_BIT = 0x8, /* enable adc acquisition done interrupt */ |
203 | DAC_INTR_SRC_MASK = 0x30, | 203 | DAC_INTR_SRC_MASK = 0x30, |
204 | DAC_INTR_QEMPTY_BITS = 0x0, | 204 | DAC_INTR_QEMPTY_BITS = 0x0, |
205 | DAC_INTR_HIGH_CHAN_BITS = 0x10, | 205 | DAC_INTR_HIGH_CHAN_BITS = 0x10, |
@@ -2867,7 +2867,7 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
2867 | 2867 | ||
2868 | spin_unlock_irqrestore(&dev->spinlock, flags); | 2868 | spin_unlock_irqrestore(&dev->spinlock, flags); |
2869 | 2869 | ||
2870 | /* start aquisition */ | 2870 | /* start acquisition */ |
2871 | if (cmd->start_src == TRIG_NOW) { | 2871 | if (cmd->start_src == TRIG_NOW) { |
2872 | writew(0, priv(dev)->main_iobase + ADC_START_REG); | 2872 | writew(0, priv(dev)->main_iobase + ADC_START_REG); |
2873 | DEBUG_PRINT("soft trig\n"); | 2873 | DEBUG_PRINT("soft trig\n"); |
@@ -2942,7 +2942,7 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev) | |||
2942 | /* Read from 32 bit wide ai fifo of 4020 - deal with insane grey coding of pointers. | 2942 | /* Read from 32 bit wide ai fifo of 4020 - deal with insane grey coding of pointers. |
2943 | * The pci-4020 hardware only supports | 2943 | * The pci-4020 hardware only supports |
2944 | * dma transfers (it only supports the use of pio for draining the last remaining | 2944 | * dma transfers (it only supports the use of pio for draining the last remaining |
2945 | * points from the fifo when a data aquisition operation has completed). | 2945 | * points from the fifo when a data acquisition operation has completed). |
2946 | */ | 2946 | */ |
2947 | static void pio_drain_ai_fifo_32(struct comedi_device *dev) | 2947 | static void pio_drain_ai_fifo_32(struct comedi_device *dev) |
2948 | { | 2948 | { |
@@ -3046,7 +3046,7 @@ static void handle_ai_interrupt(struct comedi_device *dev, | |||
3046 | comedi_error(dev, "fifo overrun"); | 3046 | comedi_error(dev, "fifo overrun"); |
3047 | async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; | 3047 | async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; |
3048 | } | 3048 | } |
3049 | /* spin lock makes sure noone else changes plx dma control reg */ | 3049 | /* spin lock makes sure no one else changes plx dma control reg */ |
3050 | spin_lock_irqsave(&dev->spinlock, flags); | 3050 | spin_lock_irqsave(&dev->spinlock, flags); |
3051 | dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG); | 3051 | dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG); |
3052 | if (plx_status & ICS_DMA1_A) { /* dma chan 1 interrupt */ | 3052 | if (plx_status & ICS_DMA1_A) { /* dma chan 1 interrupt */ |
@@ -3170,7 +3170,7 @@ static void handle_ao_interrupt(struct comedi_device *dev, | |||
3170 | async = s->async; | 3170 | async = s->async; |
3171 | cmd = &async->cmd; | 3171 | cmd = &async->cmd; |
3172 | 3172 | ||
3173 | /* spin lock makes sure noone else changes plx dma control reg */ | 3173 | /* spin lock makes sure no one else changes plx dma control reg */ |
3174 | spin_lock_irqsave(&dev->spinlock, flags); | 3174 | spin_lock_irqsave(&dev->spinlock, flags); |
3175 | dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG); | 3175 | dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG); |
3176 | if (plx_status & ICS_DMA0_A) { /* dma chan 0 interrupt */ | 3176 | if (plx_status & ICS_DMA0_A) { /* dma chan 0 interrupt */ |
diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c index b220b3055412..a804742b8022 100644 --- a/drivers/staging/comedi/drivers/comedi_test.c +++ b/drivers/staging/comedi/drivers/comedi_test.c | |||
@@ -81,7 +81,7 @@ static const struct waveform_board waveform_boards[] = { | |||
81 | /* Data unique to this driver */ | 81 | /* Data unique to this driver */ |
82 | struct waveform_private { | 82 | struct waveform_private { |
83 | struct timer_list timer; | 83 | struct timer_list timer; |
84 | struct timeval last; /* time at which last timer interrupt occured */ | 84 | struct timeval last; /* time at which last timer interrupt occurred */ |
85 | unsigned int uvolt_amplitude; /* waveform amplitude in microvolts */ | 85 | unsigned int uvolt_amplitude; /* waveform amplitude in microvolts */ |
86 | unsigned long usec_period; /* waveform period in microseconds */ | 86 | unsigned long usec_period; /* waveform period in microseconds */ |
87 | unsigned long usec_current; /* current time (modulo waveform period) */ | 87 | unsigned long usec_current; /* current time (modulo waveform period) */ |
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c index 6ea93f9c0b48..60c2b12d6ffb 100644 --- a/drivers/staging/comedi/drivers/das1800.c +++ b/drivers/staging/comedi/drivers/das1800.c | |||
@@ -1087,7 +1087,7 @@ static void das1800_flush_dma_channel(struct comedi_device *dev, | |||
1087 | return; | 1087 | return; |
1088 | } | 1088 | } |
1089 | 1089 | ||
1090 | /* flushes remaining data from board when external trigger has stopped aquisition | 1090 | /* flushes remaining data from board when external trigger has stopped acquisition |
1091 | * and we are using dma transfers */ | 1091 | * and we are using dma transfers */ |
1092 | static void das1800_flush_dma(struct comedi_device *dev, | 1092 | static void das1800_flush_dma(struct comedi_device *dev, |
1093 | struct comedi_subdevice *s) | 1093 | struct comedi_subdevice *s) |
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c index aecaedc5027e..96d41ad76956 100644 --- a/drivers/staging/comedi/drivers/das800.c +++ b/drivers/staging/comedi/drivers/das800.c | |||
@@ -391,7 +391,7 @@ static irqreturn_t das800_interrupt(int irq, void *d) | |||
391 | spin_lock_irqsave(&dev->spinlock, irq_flags); | 391 | spin_lock_irqsave(&dev->spinlock, irq_flags); |
392 | outb(CONTROL1, dev->iobase + DAS800_GAIN); /* select base address + 7 to be STATUS2 register */ | 392 | outb(CONTROL1, dev->iobase + DAS800_GAIN); /* select base address + 7 to be STATUS2 register */ |
393 | status = inb(dev->iobase + DAS800_STATUS2) & STATUS2_HCEN; | 393 | status = inb(dev->iobase + DAS800_STATUS2) & STATUS2_HCEN; |
394 | /* don't release spinlock yet since we want to make sure noone else disables hardware conversions */ | 394 | /* don't release spinlock yet since we want to make sure no one else disables hardware conversions */ |
395 | if (status == 0) { | 395 | if (status == 0) { |
396 | spin_unlock_irqrestore(&dev->spinlock, irq_flags); | 396 | spin_unlock_irqrestore(&dev->spinlock, irq_flags); |
397 | return IRQ_HANDLED; | 397 | return IRQ_HANDLED; |
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c index 693728e14bdb..2b4e6e6eb825 100644 --- a/drivers/staging/comedi/drivers/dmm32at.c +++ b/drivers/staging/comedi/drivers/dmm32at.c | |||
@@ -532,7 +532,7 @@ static int dmm32at_ai_rinsn(struct comedi_device *dev, | |||
532 | msb = dmm_inb(dev, DMM32AT_AIMSB); | 532 | msb = dmm_inb(dev, DMM32AT_AIMSB); |
533 | 533 | ||
534 | /* invert sign bit to make range unsigned, this is an | 534 | /* invert sign bit to make range unsigned, this is an |
535 | idiosyncracy of the diamond board, it return | 535 | idiosyncrasy of the diamond board, it return |
536 | conversions as a signed value, i.e. -32768 to | 536 | conversions as a signed value, i.e. -32768 to |
537 | 32767, flipping the bit and interpreting it as | 537 | 32767, flipping the bit and interpreting it as |
538 | signed gives you a range of 0 to 65535 which is | 538 | signed gives you a range of 0 to 65535 which is |
diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c index a1664caa1d96..0131d5225b52 100644 --- a/drivers/staging/comedi/drivers/dt2811.c +++ b/drivers/staging/comedi/drivers/dt2811.c | |||
@@ -560,7 +560,7 @@ int dt2811_adtrig(kdev_t minor, comedi_adtrig *adtrig) | |||
560 | switch (dev->i_admode) { | 560 | switch (dev->i_admode) { |
561 | case COMEDI_MDEMAND: | 561 | case COMEDI_MDEMAND: |
562 | dev->ntrig = adtrig->n - 1; | 562 | dev->ntrig = adtrig->n - 1; |
563 | /* not neccessary */ | 563 | /* not necessary */ |
564 | /*printk("dt2811: AD soft trigger\n"); */ | 564 | /*printk("dt2811: AD soft trigger\n"); */ |
565 | /*outb(DT2811_CLRERROR|DT2811_INTENB, | 565 | /*outb(DT2811_CLRERROR|DT2811_INTENB, |
566 | dev->iobase+DT2811_ADCSR); */ | 566 | dev->iobase+DT2811_ADCSR); */ |
diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c index 06059850dae2..32d9c42e9659 100644 --- a/drivers/staging/comedi/drivers/dt9812.c +++ b/drivers/staging/comedi/drivers/dt9812.c | |||
@@ -773,7 +773,7 @@ static int dt9812_probe(struct usb_interface *interface, | |||
773 | retval = dt9812_read_info(dev, 1, &fw, sizeof(fw)); | 773 | retval = dt9812_read_info(dev, 1, &fw, sizeof(fw)); |
774 | if (retval == 0) { | 774 | if (retval == 0) { |
775 | dev_info(&interface->dev, | 775 | dev_info(&interface->dev, |
776 | "usb_reset_configuration succeded " | 776 | "usb_reset_configuration succeeded " |
777 | "after %d iterations\n", i); | 777 | "after %d iterations\n", i); |
778 | break; | 778 | break; |
779 | } | 779 | } |
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c index 1661b57ca2ad..bc020dea141b 100644 --- a/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/drivers/staging/comedi/drivers/gsc_hpdi.c | |||
@@ -1031,7 +1031,7 @@ static irqreturn_t handle_interrupt(int irq, void *d) | |||
1031 | writel(hpdi_intr_status, | 1031 | writel(hpdi_intr_status, |
1032 | priv(dev)->hpdi_iobase + INTERRUPT_STATUS_REG); | 1032 | priv(dev)->hpdi_iobase + INTERRUPT_STATUS_REG); |
1033 | } | 1033 | } |
1034 | /* spin lock makes sure noone else changes plx dma control reg */ | 1034 | /* spin lock makes sure no one else changes plx dma control reg */ |
1035 | spin_lock_irqsave(&dev->spinlock, flags); | 1035 | spin_lock_irqsave(&dev->spinlock, flags); |
1036 | dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG); | 1036 | dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG); |
1037 | if (plx_status & ICS_DMA0_A) { /* dma chan 0 interrupt */ | 1037 | if (plx_status & ICS_DMA0_A) { /* dma chan 0 interrupt */ |
@@ -1045,7 +1045,7 @@ static irqreturn_t handle_interrupt(int irq, void *d) | |||
1045 | } | 1045 | } |
1046 | spin_unlock_irqrestore(&dev->spinlock, flags); | 1046 | spin_unlock_irqrestore(&dev->spinlock, flags); |
1047 | 1047 | ||
1048 | /* spin lock makes sure noone else changes plx dma control reg */ | 1048 | /* spin lock makes sure no one else changes plx dma control reg */ |
1049 | spin_lock_irqsave(&dev->spinlock, flags); | 1049 | spin_lock_irqsave(&dev->spinlock, flags); |
1050 | dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG); | 1050 | dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG); |
1051 | if (plx_status & ICS_DMA1_A) { /* XXX *//* dma chan 1 interrupt */ | 1051 | if (plx_status & ICS_DMA1_A) { /* XXX *//* dma chan 1 interrupt */ |
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 0bab39b3409b..126550f3c02b 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c | |||
@@ -715,7 +715,7 @@ Description: | |||
715 | is built correctly | 715 | is built correctly |
716 | 716 | ||
717 | Parameters: | 717 | Parameters: |
718 | struct comedi_device *dev Pointer to current sevice structure | 718 | struct comedi_device *dev Pointer to current service structure |
719 | struct comedi_subdevice *s Pointer to current subdevice structure | 719 | struct comedi_subdevice *s Pointer to current subdevice structure |
720 | unsigned int *chanlist Pointer to packed channel list | 720 | unsigned int *chanlist Pointer to packed channel list |
721 | unsigned int n_chan Number of channels to scan | 721 | unsigned int n_chan Number of channels to scan |
@@ -772,7 +772,7 @@ Description: | |||
772 | Status register. | 772 | Status register. |
773 | 773 | ||
774 | Parameters: | 774 | Parameters: |
775 | struct comedi_device *dev Pointer to current sevice structure | 775 | struct comedi_device *dev Pointer to current service structure |
776 | struct comedi_subdevice *s Pointer to current subdevice structure | 776 | struct comedi_subdevice *s Pointer to current subdevice structure |
777 | unsigned int *chanlist Pointer to packed channel list | 777 | unsigned int *chanlist Pointer to packed channel list |
778 | unsigned int n_chan Number of channels to scan | 778 | unsigned int n_chan Number of channels to scan |
@@ -848,7 +848,7 @@ Description: | |||
848 | This function resets the icp multi device to a 'safe' state | 848 | This function resets the icp multi device to a 'safe' state |
849 | 849 | ||
850 | Parameters: | 850 | Parameters: |
851 | struct comedi_device *dev Pointer to current sevice structure | 851 | struct comedi_device *dev Pointer to current service structure |
852 | 852 | ||
853 | Returns:int 0 = success | 853 | Returns:int 0 = success |
854 | 854 | ||
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 75511bae0191..b692fea0d2b0 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c | |||
@@ -1810,7 +1810,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id) | |||
1810 | ai_context->irq_status_reg) & | 1810 | ai_context->irq_status_reg) & |
1811 | ME4000_IRQ_STATUS_BIT_AI_HF) { | 1811 | ME4000_IRQ_STATUS_BIT_AI_HF) { |
1812 | ISR_PDEBUG | 1812 | ISR_PDEBUG |
1813 | ("me4000_ai_isr(): Fifo half full interrupt occured\n"); | 1813 | ("me4000_ai_isr(): Fifo half full interrupt occurred\n"); |
1814 | 1814 | ||
1815 | /* Read status register to find out what happened */ | 1815 | /* Read status register to find out what happened */ |
1816 | tmp = me4000_inl(dev, ai_context->ctrl_reg); | 1816 | tmp = me4000_inl(dev, ai_context->ctrl_reg); |
@@ -1903,7 +1903,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id) | |||
1903 | if (me4000_inl(dev, | 1903 | if (me4000_inl(dev, |
1904 | ai_context->irq_status_reg) & ME4000_IRQ_STATUS_BIT_SC) { | 1904 | ai_context->irq_status_reg) & ME4000_IRQ_STATUS_BIT_SC) { |
1905 | ISR_PDEBUG | 1905 | ISR_PDEBUG |
1906 | ("me4000_ai_isr(): Sample counter interrupt occured\n"); | 1906 | ("me4000_ai_isr(): Sample counter interrupt occurred\n"); |
1907 | 1907 | ||
1908 | s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOA; | 1908 | s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOA; |
1909 | 1909 | ||
diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c index a89eebd23f65..dd09a6d46e5c 100644 --- a/drivers/staging/comedi/drivers/mpc624.c +++ b/drivers/staging/comedi/drivers/mpc624.c | |||
@@ -39,8 +39,8 @@ Status: working | |||
39 | 39 | ||
40 | Configuration Options: | 40 | Configuration Options: |
41 | [0] - I/O base address | 41 | [0] - I/O base address |
42 | [1] - convertion rate | 42 | [1] - conversion rate |
43 | Convertion rate RMS noise Effective Number Of Bits | 43 | Conversion rate RMS noise Effective Number Of Bits |
44 | 0 3.52kHz 23uV 17 | 44 | 0 3.52kHz 23uV 17 |
45 | 1 1.76kHz 3.5uV 20 | 45 | 1 1.76kHz 3.5uV 20 |
46 | 2 880Hz 2uV 21.3 | 46 | 2 880Hz 2uV 21.3 |
@@ -93,8 +93,8 @@ Configuration Options: | |||
93 | #define MPC624_DMY_BIT (1<<30) | 93 | #define MPC624_DMY_BIT (1<<30) |
94 | #define MPC624_SGN_BIT (1<<29) | 94 | #define MPC624_SGN_BIT (1<<29) |
95 | 95 | ||
96 | /* Convertion speeds */ | 96 | /* Conversion speeds */ |
97 | /* OSR4 OSR3 OSR2 OSR1 OSR0 Convertion rate RMS noise ENOB^ | 97 | /* OSR4 OSR3 OSR2 OSR1 OSR0 Conversion rate RMS noise ENOB^ |
98 | * X 0 0 0 1 3.52kHz 23uV 17 | 98 | * X 0 0 0 1 3.52kHz 23uV 17 |
99 | * X 0 0 1 0 1.76kHz 3.5uV 20 | 99 | * X 0 0 1 0 1.76kHz 3.5uV 20 |
100 | * X 0 0 1 1 880Hz 2uV 21.3 | 100 | * X 0 0 1 1 880Hz 2uV 21.3 |
@@ -227,7 +227,7 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
227 | break; | 227 | break; |
228 | default: | 228 | default: |
229 | printk | 229 | printk |
230 | (KERN_ERR "illegal convertion rate setting!" | 230 | (KERN_ERR "illegal conversion rate setting!" |
231 | " Valid numbers are 0..9. Using 9 => 6.875 Hz, "); | 231 | " Valid numbers are 0..9. Using 9 => 6.875 Hz, "); |
232 | devpriv->ulConvertionRate = MPC624_SPEED_3_52_kHz; | 232 | devpriv->ulConvertionRate = MPC624_SPEED_3_52_kHz; |
233 | } | 233 | } |
@@ -296,7 +296,7 @@ static int mpc624_ai_rinsn(struct comedi_device *dev, | |||
296 | } | 296 | } |
297 | 297 | ||
298 | for (n = 0; n < insn->n; n++) { | 298 | for (n = 0; n < insn->n; n++) { |
299 | /* Trigger the convertion */ | 299 | /* Trigger the conversion */ |
300 | outb(MPC624_ADSCK, dev->iobase + MPC624_ADC); | 300 | outb(MPC624_ADSCK, dev->iobase + MPC624_ADC); |
301 | udelay(1); | 301 | udelay(1); |
302 | outb(MPC624_ADCS | MPC624_ADSCK, dev->iobase + MPC624_ADC); | 302 | outb(MPC624_ADCS | MPC624_ADSCK, dev->iobase + MPC624_ADC); |
@@ -304,7 +304,7 @@ static int mpc624_ai_rinsn(struct comedi_device *dev, | |||
304 | outb(0, dev->iobase + MPC624_ADC); | 304 | outb(0, dev->iobase + MPC624_ADC); |
305 | udelay(1); | 305 | udelay(1); |
306 | 306 | ||
307 | /* Wait for the convertion to end */ | 307 | /* Wait for the conversion to end */ |
308 | for (i = 0; i < TIMEOUT; i++) { | 308 | for (i = 0; i < TIMEOUT; i++) { |
309 | ucPort = inb(dev->iobase + MPC624_ADC); | 309 | ucPort = inb(dev->iobase + MPC624_ADC); |
310 | if (ucPort & MPC624_ADBUSY) | 310 | if (ucPort & MPC624_ADBUSY) |
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c index 4d0053ea2465..c192b71ec04f 100644 --- a/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c | |||
@@ -104,10 +104,10 @@ TRIG_WAKE_EOS | |||
104 | #define STATUS_REG 0x12 /* read only */ | 104 | #define STATUS_REG 0x12 /* read only */ |
105 | #define FNE_BIT 0x1 /* fifo not empty */ | 105 | #define FNE_BIT 0x1 /* fifo not empty */ |
106 | #define OVFL_BIT 0x8 /* fifo overflow */ | 106 | #define OVFL_BIT 0x8 /* fifo overflow */ |
107 | #define EDAQ_BIT 0x10 /* end of aquisition interrupt */ | 107 | #define EDAQ_BIT 0x10 /* end of acquisition interrupt */ |
108 | #define DCAL_BIT 0x20 /* offset calibration in progress */ | 108 | #define DCAL_BIT 0x20 /* offset calibration in progress */ |
109 | #define INTR_BIT 0x40 /* interrupt has occured */ | 109 | #define INTR_BIT 0x40 /* interrupt has occurred */ |
110 | #define DMA_TC_BIT 0x80 /* dma terminal count interrupt has occured */ | 110 | #define DMA_TC_BIT 0x80 /* dma terminal count interrupt has occurred */ |
111 | #define ID_BITS(x) (((x) >> 8) & 0x3) | 111 | #define ID_BITS(x) (((x) >> 8) & 0x3) |
112 | #define IRQ_DMA_CNTRL_REG 0x12 /* write only */ | 112 | #define IRQ_DMA_CNTRL_REG 0x12 /* write only */ |
113 | #define DMA_CHAN_BITS(x) ((x) & 0x7) /* sets dma channel */ | 113 | #define DMA_CHAN_BITS(x) ((x) & 0x7) /* sets dma channel */ |
@@ -434,7 +434,7 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
434 | s->cancel = a2150_cancel; | 434 | s->cancel = a2150_cancel; |
435 | 435 | ||
436 | /* need to do this for software counting of completed conversions, to | 436 | /* need to do this for software counting of completed conversions, to |
437 | * prevent hardware count from stopping aquisition */ | 437 | * prevent hardware count from stopping acquisition */ |
438 | outw(HW_COUNT_DISABLE, dev->iobase + I8253_MODE_REG); | 438 | outw(HW_COUNT_DISABLE, dev->iobase + I8253_MODE_REG); |
439 | 439 | ||
440 | /* set card's irq and dma levels */ | 440 | /* set card's irq and dma levels */ |
@@ -729,7 +729,7 @@ static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
729 | /* send trigger config bits */ | 729 | /* send trigger config bits */ |
730 | outw(trigger_bits, dev->iobase + TRIGGER_REG); | 730 | outw(trigger_bits, dev->iobase + TRIGGER_REG); |
731 | 731 | ||
732 | /* start aquisition for soft trigger */ | 732 | /* start acquisition for soft trigger */ |
733 | if (cmd->start_src == TRIG_NOW) { | 733 | if (cmd->start_src == TRIG_NOW) { |
734 | outw(0, dev->iobase + FIFO_START_REG); | 734 | outw(0, dev->iobase + FIFO_START_REG); |
735 | } | 735 | } |
@@ -768,7 +768,7 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, | |||
768 | /* setup start triggering */ | 768 | /* setup start triggering */ |
769 | outw(0, dev->iobase + TRIGGER_REG); | 769 | outw(0, dev->iobase + TRIGGER_REG); |
770 | 770 | ||
771 | /* start aquisition for soft trigger */ | 771 | /* start acquisition for soft trigger */ |
772 | outw(0, dev->iobase + FIFO_START_REG); | 772 | outw(0, dev->iobase + FIFO_START_REG); |
773 | 773 | ||
774 | /* there is a 35.6 sample delay for data to get through the antialias filter */ | 774 | /* there is a 35.6 sample delay for data to get through the antialias filter */ |
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 241fe525abf0..ab8f37022a3c 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
@@ -183,11 +183,11 @@ NI manuals: | |||
183 | #define OVERRUN_BIT 0x2 | 183 | #define OVERRUN_BIT 0x2 |
184 | /* fifo overflow */ | 184 | /* fifo overflow */ |
185 | #define OVERFLOW_BIT 0x4 | 185 | #define OVERFLOW_BIT 0x4 |
186 | /* timer interrupt has occured */ | 186 | /* timer interrupt has occurred */ |
187 | #define TIMER_BIT 0x8 | 187 | #define TIMER_BIT 0x8 |
188 | /* dma terminal count has occured */ | 188 | /* dma terminal count has occurred */ |
189 | #define DMATC_BIT 0x10 | 189 | #define DMATC_BIT 0x10 |
190 | /* external trigger has occured */ | 190 | /* external trigger has occurred */ |
191 | #define EXT_TRIG_BIT 0x40 | 191 | #define EXT_TRIG_BIT 0x40 |
192 | /* 1200 boards only */ | 192 | /* 1200 boards only */ |
193 | #define STATUS2_REG 0x1d | 193 | #define STATUS2_REG 0x1d |
@@ -1149,7 +1149,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1149 | range = CR_RANGE(cmd->chanlist[0]); | 1149 | range = CR_RANGE(cmd->chanlist[0]); |
1150 | aref = CR_AREF(cmd->chanlist[0]); | 1150 | aref = CR_AREF(cmd->chanlist[0]); |
1151 | 1151 | ||
1152 | /* make sure board is disabled before setting up aquisition */ | 1152 | /* make sure board is disabled before setting up acquisition */ |
1153 | spin_lock_irqsave(&dev->spinlock, flags); | 1153 | spin_lock_irqsave(&dev->spinlock, flags); |
1154 | devpriv->command2_bits &= ~SWTRIG_BIT & ~HWTRIG_BIT & ~PRETRIG_BIT; | 1154 | devpriv->command2_bits &= ~SWTRIG_BIT & ~HWTRIG_BIT & ~PRETRIG_BIT; |
1155 | devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); | 1155 | devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); |
@@ -1349,7 +1349,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1349 | devpriv->command3_bits &= ~ADC_FNE_INTR_EN_BIT; | 1349 | devpriv->command3_bits &= ~ADC_FNE_INTR_EN_BIT; |
1350 | devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG); | 1350 | devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG); |
1351 | 1351 | ||
1352 | /* startup aquisition */ | 1352 | /* startup acquisition */ |
1353 | 1353 | ||
1354 | /* command2 reg */ | 1354 | /* command2 reg */ |
1355 | /* use 2 cascaded counters for pacing */ | 1355 | /* use 2 cascaded counters for pacing */ |
@@ -1571,8 +1571,8 @@ static void handle_isa_dma(struct comedi_device *dev) | |||
1571 | devpriv->write_byte(0x1, dev->iobase + DMATC_CLEAR_REG); | 1571 | devpriv->write_byte(0x1, dev->iobase + DMATC_CLEAR_REG); |
1572 | } | 1572 | } |
1573 | 1573 | ||
1574 | /* makes sure all data acquired by board is transfered to comedi (used | 1574 | /* makes sure all data acquired by board is transferred to comedi (used |
1575 | * when aquisition is terminated by stop_src == TRIG_EXT). */ | 1575 | * when acquisition is terminated by stop_src == TRIG_EXT). */ |
1576 | static void labpc_drain_dregs(struct comedi_device *dev) | 1576 | static void labpc_drain_dregs(struct comedi_device *dev) |
1577 | { | 1577 | { |
1578 | if (devpriv->current_transfer == isa_dma_transfer) | 1578 | if (devpriv->current_transfer == isa_dma_transfer) |
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 005d2fe86ee4..8dd3a01d48dd 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c | |||
@@ -821,7 +821,7 @@ static int ni_pcidio_cmdtest(struct comedi_device *dev, | |||
821 | cmd->scan_begin_arg = MAX_SPEED; | 821 | cmd->scan_begin_arg = MAX_SPEED; |
822 | err++; | 822 | err++; |
823 | } | 823 | } |
824 | /* no minumum speed */ | 824 | /* no minimum speed */ |
825 | } else { | 825 | } else { |
826 | /* TRIG_EXT */ | 826 | /* TRIG_EXT */ |
827 | /* should be level/edge, hi/lo specification here */ | 827 | /* should be level/edge, hi/lo specification here */ |
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c index c6dce4a1425e..09ff4723b225 100644 --- a/drivers/staging/comedi/drivers/pcl812.c +++ b/drivers/staging/comedi/drivers/pcl812.c | |||
@@ -34,7 +34,7 @@ | |||
34 | * and I cann't test all features.) | 34 | * and I cann't test all features.) |
35 | * | 35 | * |
36 | * This driver supports insn and cmd interfaces. Some boards support only insn | 36 | * This driver supports insn and cmd interfaces. Some boards support only insn |
37 | * becouse their hardware don't allow more (PCL-813/B, ACL-8113, ISO-813). | 37 | * because their hardware don't allow more (PCL-813/B, ACL-8113, ISO-813). |
38 | * Data transfer over DMA is supported only when you measure only one | 38 | * Data transfer over DMA is supported only when you measure only one |
39 | * channel, this is too hardware limitation of these boards. | 39 | * channel, this is too hardware limitation of these boards. |
40 | * | 40 | * |
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index ef3cc4f3be6e..8f3fc6ee088b 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c | |||
@@ -954,7 +954,7 @@ check_channel_list(struct comedi_device *dev, | |||
954 | } | 954 | } |
955 | 955 | ||
956 | if (chanlen > 1) { | 956 | if (chanlen > 1) { |
957 | /* first channel is everytime ok */ | 957 | /* first channel is every time ok */ |
958 | chansegment[0] = chanlist[0]; | 958 | chansegment[0] = chanlist[0]; |
959 | for (i = 1, seglen = 1; i < chanlen; i++, seglen++) { | 959 | for (i = 1, seglen = 1; i < chanlen; i++, seglen++) { |
960 | /* build part of chanlist */ | 960 | /* build part of chanlist */ |
@@ -968,10 +968,10 @@ check_channel_list(struct comedi_device *dev, | |||
968 | nowmustbechan = | 968 | nowmustbechan = |
969 | (CR_CHAN(chansegment[i - 1]) + 1) % chanlen; | 969 | (CR_CHAN(chansegment[i - 1]) + 1) % chanlen; |
970 | if (nowmustbechan != CR_CHAN(chanlist[i])) { | 970 | if (nowmustbechan != CR_CHAN(chanlist[i])) { |
971 | /* channel list isn't continous :-( */ | 971 | /* channel list isn't continuous :-( */ |
972 | printk(KERN_WARNING | 972 | printk(KERN_WARNING |
973 | "comedi%d: pcl816: channel list must " | 973 | "comedi%d: pcl816: channel list must " |
974 | "be continous! chanlist[%i]=%d but " | 974 | "be continuous! chanlist[%i]=%d but " |
975 | "must be %d or %d!\n", dev->minor, | 975 | "must be %d or %d!\n", dev->minor, |
976 | i, CR_CHAN(chanlist[i]), nowmustbechan, | 976 | i, CR_CHAN(chanlist[i]), nowmustbechan, |
977 | CR_CHAN(chanlist[0])); | 977 | CR_CHAN(chanlist[0])); |
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index f58d75be7295..e3eea09ae1fb 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c | |||
@@ -1231,7 +1231,7 @@ static int check_channel_list(struct comedi_device *dev, | |||
1231 | } | 1231 | } |
1232 | 1232 | ||
1233 | if (n_chan > 1) { | 1233 | if (n_chan > 1) { |
1234 | /* first channel is everytime ok */ | 1234 | /* first channel is every time ok */ |
1235 | chansegment[0] = chanlist[0]; | 1235 | chansegment[0] = chanlist[0]; |
1236 | /* build part of chanlist */ | 1236 | /* build part of chanlist */ |
1237 | for (i = 1, seglen = 1; i < n_chan; i++, seglen++) { | 1237 | for (i = 1, seglen = 1; i < n_chan; i++, seglen++) { |
@@ -1245,9 +1245,9 @@ static int check_channel_list(struct comedi_device *dev, | |||
1245 | break; | 1245 | break; |
1246 | nowmustbechan = | 1246 | nowmustbechan = |
1247 | (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan; | 1247 | (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan; |
1248 | if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continous :-( */ | 1248 | if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continuous :-( */ |
1249 | printk | 1249 | printk |
1250 | ("comedi%d: pcl818: channel list must be continous! chanlist[%i]=%d but must be %d or %d!\n", | 1250 | ("comedi%d: pcl818: channel list must be continuous! chanlist[%i]=%d but must be %d or %d!\n", |
1251 | dev->minor, i, CR_CHAN(chanlist[i]), | 1251 | dev->minor, i, CR_CHAN(chanlist[i]), |
1252 | nowmustbechan, CR_CHAN(chanlist[0])); | 1252 | nowmustbechan, CR_CHAN(chanlist[0])); |
1253 | return 0; | 1253 | return 0; |
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index 5c832d7ed45d..f2e88e57d558 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c | |||
@@ -733,7 +733,7 @@ static int pcmmio_dio_insn_config(struct comedi_device *dev, | |||
733 | break; | 733 | break; |
734 | 734 | ||
735 | case INSN_CONFIG_DIO_QUERY: | 735 | case INSN_CONFIG_DIO_QUERY: |
736 | /* retreive from shadow register */ | 736 | /* retrieve from shadow register */ |
737 | data[1] = | 737 | data[1] = |
738 | (s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT; | 738 | (s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT; |
739 | return insn->n; | 739 | return insn->n; |
@@ -1279,7 +1279,7 @@ static int wait_dac_ready(unsigned long iobase) | |||
1279 | "no busy waiting" policy. The fact is that the hardware is | 1279 | "no busy waiting" policy. The fact is that the hardware is |
1280 | normally so fast that we usually only need one time through the loop | 1280 | normally so fast that we usually only need one time through the loop |
1281 | anyway. The longer timeout is for rare occasions and for detecting | 1281 | anyway. The longer timeout is for rare occasions and for detecting |
1282 | non-existant hardware. */ | 1282 | non-existent hardware. */ |
1283 | 1283 | ||
1284 | while (retry--) { | 1284 | while (retry--) { |
1285 | if (inb(iobase + 3) & 0x80) | 1285 | if (inb(iobase + 3) & 0x80) |
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index 7a9287433b2e..b2c2c8971a32 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c | |||
@@ -605,7 +605,7 @@ static int pcmuio_dio_insn_config(struct comedi_device *dev, | |||
605 | break; | 605 | break; |
606 | 606 | ||
607 | case INSN_CONFIG_DIO_QUERY: | 607 | case INSN_CONFIG_DIO_QUERY: |
608 | /* retreive from shadow register */ | 608 | /* retrieve from shadow register */ |
609 | data[1] = | 609 | data[1] = |
610 | (s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT; | 610 | (s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT; |
611 | return insn->n; | 611 | return insn->n; |
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index ebba9bb47777..82942e5728a5 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c | |||
@@ -390,7 +390,7 @@ static int daqp_ai_insn_read(struct comedi_device *dev, | |||
390 | 390 | ||
391 | outb(v, dev->iobase + DAQP_CONTROL); | 391 | outb(v, dev->iobase + DAQP_CONTROL); |
392 | 392 | ||
393 | /* Reset any pending interrupts (my card has a tendancy to require | 393 | /* Reset any pending interrupts (my card has a tendency to require |
394 | * require multiple reads on the status register to achieve this) | 394 | * require multiple reads on the status register to achieve this) |
395 | */ | 395 | */ |
396 | 396 | ||
@@ -752,7 +752,7 @@ static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
752 | 752 | ||
753 | outb(v, dev->iobase + DAQP_CONTROL); | 753 | outb(v, dev->iobase + DAQP_CONTROL); |
754 | 754 | ||
755 | /* Reset any pending interrupts (my card has a tendancy to require | 755 | /* Reset any pending interrupts (my card has a tendency to require |
756 | * require multiple reads on the status register to achieve this) | 756 | * require multiple reads on the status register to achieve this) |
757 | */ | 757 | */ |
758 | counter = 100; | 758 | counter = 100; |
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 357858d27441..7f09ed755fe6 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c | |||
@@ -75,7 +75,7 @@ Configuration options: | |||
75 | das1800, since they have the best documented code. Driver | 75 | das1800, since they have the best documented code. Driver |
76 | cb_pcidas64.c uses the same DMA controller. | 76 | cb_pcidas64.c uses the same DMA controller. |
77 | 77 | ||
78 | As far as I can tell, the About interrupt doesnt work if Sample is | 78 | As far as I can tell, the About interrupt doesn't work if Sample is |
79 | also enabled. It turns out that About really isn't needed, since | 79 | also enabled. It turns out that About really isn't needed, since |
80 | we always count down samples read. | 80 | we always count down samples read. |
81 | 81 | ||
@@ -370,7 +370,7 @@ struct rtdPrivate { | |||
370 | /* timer gate (when enabled) */ | 370 | /* timer gate (when enabled) */ |
371 | u8 utcGate[4]; /* 1 extra allows simple range check */ | 371 | u8 utcGate[4]; /* 1 extra allows simple range check */ |
372 | 372 | ||
373 | /* shadow registers affect other registers, but cant be read back */ | 373 | /* shadow registers affect other registers, but can't be read back */ |
374 | /* The macros below update these on writes */ | 374 | /* The macros below update these on writes */ |
375 | u16 intMask; /* interrupt mask */ | 375 | u16 intMask; /* interrupt mask */ |
376 | u16 intClearMask; /* interrupt clear mask */ | 376 | u16 intClearMask; /* interrupt clear mask */ |
@@ -485,7 +485,7 @@ struct rtdPrivate { | |||
485 | #define RtdAdcFifoGet(dev) \ | 485 | #define RtdAdcFifoGet(dev) \ |
486 | readw(devpriv->las1+LAS1_ADC_FIFO) | 486 | readw(devpriv->las1+LAS1_ADC_FIFO) |
487 | 487 | ||
488 | /* Read two ADC data values (DOESNT WORK) */ | 488 | /* Read two ADC data values (DOESN'T WORK) */ |
489 | #define RtdAdcFifoGet2(dev) \ | 489 | #define RtdAdcFifoGet2(dev) \ |
490 | readl(devpriv->las1+LAS1_ADC_FIFO) | 490 | readl(devpriv->las1+LAS1_ADC_FIFO) |
491 | 491 | ||
@@ -857,7 +857,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
857 | DPRINTK("rtd520: PCI latency = %d\n", pci_latency); | 857 | DPRINTK("rtd520: PCI latency = %d\n", pci_latency); |
858 | } | 858 | } |
859 | 859 | ||
860 | /* Undocumented EPLD version (doesnt match RTD driver results) */ | 860 | /* Undocumented EPLD version (doesn't match RTD driver results) */ |
861 | /*DPRINTK ("rtd520: Reading epld from %p\n", | 861 | /*DPRINTK ("rtd520: Reading epld from %p\n", |
862 | devpriv->las0+0); | 862 | devpriv->las0+0); |
863 | epld_version = readl (devpriv->las0+0); | 863 | epld_version = readl (devpriv->las0+0); |
@@ -1291,7 +1291,7 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev) | |||
1291 | /* | 1291 | /* |
1292 | "instructions" read/write data in "one-shot" or "software-triggered" | 1292 | "instructions" read/write data in "one-shot" or "software-triggered" |
1293 | mode (simplest case). | 1293 | mode (simplest case). |
1294 | This doesnt use interrupts. | 1294 | This doesn't use interrupts. |
1295 | 1295 | ||
1296 | Note, we don't do any settling delays. Use a instruction list to | 1296 | Note, we don't do any settling delays. Use a instruction list to |
1297 | select, delay, then read. | 1297 | select, delay, then read. |
@@ -2120,7 +2120,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
2120 | } | 2120 | } |
2121 | 2121 | ||
2122 | /* | 2122 | /* |
2123 | Stop a running data aquisition. | 2123 | Stop a running data acquisition. |
2124 | */ | 2124 | */ |
2125 | static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) | 2125 | static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
2126 | { | 2126 | { |
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index d5ba3ab357a3..23fc64b9988e 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c | |||
@@ -139,7 +139,7 @@ struct s626_private { | |||
139 | int got_regions; | 139 | int got_regions; |
140 | short allocatedBuf; | 140 | short allocatedBuf; |
141 | uint8_t ai_cmd_running; /* ai_cmd is running */ | 141 | uint8_t ai_cmd_running; /* ai_cmd is running */ |
142 | uint8_t ai_continous; /* continous aquisition */ | 142 | uint8_t ai_continous; /* continous acquisition */ |
143 | int ai_sample_count; /* number of samples to acquire */ | 143 | int ai_sample_count; /* number of samples to acquire */ |
144 | unsigned int ai_sample_timer; | 144 | unsigned int ai_sample_timer; |
145 | /* time between samples in units of the timer */ | 145 | /* time between samples in units of the timer */ |
@@ -1048,7 +1048,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d) | |||
1048 | uint8_t group; | 1048 | uint8_t group; |
1049 | uint16_t irqbit; | 1049 | uint16_t irqbit; |
1050 | 1050 | ||
1051 | DEBUG("s626_irq_handler: interrupt request recieved!!!\n"); | 1051 | DEBUG("s626_irq_handler: interrupt request received!!!\n"); |
1052 | 1052 | ||
1053 | if (dev->attached == 0) | 1053 | if (dev->attached == 0) |
1054 | return IRQ_NONE; | 1054 | return IRQ_NONE; |
@@ -1165,14 +1165,14 @@ static irqreturn_t s626_irq_handler(int irq, void *d) | |||
1165 | (16 * group))) | 1165 | (16 * group))) |
1166 | == 1 && cmd->start_src == TRIG_EXT) { | 1166 | == 1 && cmd->start_src == TRIG_EXT) { |
1167 | DEBUG | 1167 | DEBUG |
1168 | ("s626_irq_handler: Edge capture interrupt recieved from channel %d\n", | 1168 | ("s626_irq_handler: Edge capture interrupt received from channel %d\n", |
1169 | cmd->start_arg); | 1169 | cmd->start_arg); |
1170 | 1170 | ||
1171 | /* Start executing the RPS program. */ | 1171 | /* Start executing the RPS program. */ |
1172 | MC_ENABLE(P_MC1, MC1_ERPS1); | 1172 | MC_ENABLE(P_MC1, MC1_ERPS1); |
1173 | 1173 | ||
1174 | DEBUG | 1174 | DEBUG |
1175 | ("s626_irq_handler: aquisition start triggered!!!\n"); | 1175 | ("s626_irq_handler: acquisition start triggered!!!\n"); |
1176 | 1176 | ||
1177 | if (cmd->scan_begin_src == | 1177 | if (cmd->scan_begin_src == |
1178 | TRIG_EXT) { | 1178 | TRIG_EXT) { |
@@ -1194,7 +1194,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d) | |||
1194 | && cmd->scan_begin_src == | 1194 | && cmd->scan_begin_src == |
1195 | TRIG_EXT) { | 1195 | TRIG_EXT) { |
1196 | DEBUG | 1196 | DEBUG |
1197 | ("s626_irq_handler: Edge capture interrupt recieved from channel %d\n", | 1197 | ("s626_irq_handler: Edge capture interrupt received from channel %d\n", |
1198 | cmd->scan_begin_arg); | 1198 | cmd->scan_begin_arg); |
1199 | 1199 | ||
1200 | /* Trigger ADC scan loop start by setting RPS Signal 0. */ | 1200 | /* Trigger ADC scan loop start by setting RPS Signal 0. */ |
@@ -1236,7 +1236,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d) | |||
1236 | == 1 | 1236 | == 1 |
1237 | && cmd->convert_src == TRIG_EXT) { | 1237 | && cmd->convert_src == TRIG_EXT) { |
1238 | DEBUG | 1238 | DEBUG |
1239 | ("s626_irq_handler: Edge capture interrupt recieved from channel %d\n", | 1239 | ("s626_irq_handler: Edge capture interrupt received from channel %d\n", |
1240 | cmd->convert_arg); | 1240 | cmd->convert_arg); |
1241 | 1241 | ||
1242 | /* Trigger ADC scan loop start by setting RPS Signal 0. */ | 1242 | /* Trigger ADC scan loop start by setting RPS Signal 0. */ |
@@ -1805,7 +1805,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1805 | DEBUG("s626_ai_cmd: NULL command\n"); | 1805 | DEBUG("s626_ai_cmd: NULL command\n"); |
1806 | return -EINVAL; | 1806 | return -EINVAL; |
1807 | } else { | 1807 | } else { |
1808 | DEBUG("s626_ai_cmd: command recieved!!!\n"); | 1808 | DEBUG("s626_ai_cmd: command received!!!\n"); |
1809 | } | 1809 | } |
1810 | 1810 | ||
1811 | if (dev->irq == 0) { | 1811 | if (dev->irq == 0) { |
@@ -1880,7 +1880,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1880 | devpriv->ai_continous = 0; | 1880 | devpriv->ai_continous = 0; |
1881 | break; | 1881 | break; |
1882 | case TRIG_NONE: | 1882 | case TRIG_NONE: |
1883 | /* continous aquisition */ | 1883 | /* continous acquisition */ |
1884 | devpriv->ai_continous = 1; | 1884 | devpriv->ai_continous = 1; |
1885 | devpriv->ai_sample_count = 0; | 1885 | devpriv->ai_sample_count = 0; |
1886 | break; | 1886 | break; |
@@ -2570,7 +2570,7 @@ static uint32_t I2Chandshake(struct comedi_device *dev, uint32_t val) | |||
2570 | while ((RR7146(P_I2CCTRL) & (I2C_BUSY | I2C_ERR)) == I2C_BUSY) | 2570 | while ((RR7146(P_I2CCTRL) & (I2C_BUSY | I2C_ERR)) == I2C_BUSY) |
2571 | ; | 2571 | ; |
2572 | 2572 | ||
2573 | /* Return non-zero if I2C error occured. */ | 2573 | /* Return non-zero if I2C error occurred. */ |
2574 | return RR7146(P_I2CCTRL) & I2C_ERR; | 2574 | return RR7146(P_I2CCTRL) & I2C_ERR; |
2575 | 2575 | ||
2576 | } | 2576 | } |
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index be93c30e4b15..e543e6c2b1bb 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c | |||
@@ -285,7 +285,7 @@ struct usbduxsub { | |||
285 | short int ao_cmd_running; | 285 | short int ao_cmd_running; |
286 | /* pwm is running */ | 286 | /* pwm is running */ |
287 | short int pwm_cmd_running; | 287 | short int pwm_cmd_running; |
288 | /* continous aquisition */ | 288 | /* continous acquisition */ |
289 | short int ai_continous; | 289 | short int ai_continous; |
290 | short int ao_continous; | 290 | short int ao_continous; |
291 | /* number of samples to acquire */ | 291 | /* number of samples to acquire */ |
@@ -500,7 +500,7 @@ static void usbduxsub_ai_IsocIrq(struct urb *urb) | |||
500 | 500 | ||
501 | /* test, if we transmit only a fixed number of samples */ | 501 | /* test, if we transmit only a fixed number of samples */ |
502 | if (!(this_usbduxsub->ai_continous)) { | 502 | if (!(this_usbduxsub->ai_continous)) { |
503 | /* not continous, fixed number of samples */ | 503 | /* not continuous, fixed number of samples */ |
504 | this_usbduxsub->ai_sample_count--; | 504 | this_usbduxsub->ai_sample_count--; |
505 | /* all samples received? */ | 505 | /* all samples received? */ |
506 | if (this_usbduxsub->ai_sample_count < 0) { | 506 | if (this_usbduxsub->ai_sample_count < 0) { |
@@ -653,7 +653,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb) | |||
653 | /* timer zero */ | 653 | /* timer zero */ |
654 | this_usbduxsub->ao_counter = this_usbduxsub->ao_timer; | 654 | this_usbduxsub->ao_counter = this_usbduxsub->ao_timer; |
655 | 655 | ||
656 | /* handle non continous aquisition */ | 656 | /* handle non continous acquisition */ |
657 | if (!(this_usbduxsub->ao_continous)) { | 657 | if (!(this_usbduxsub->ao_continous)) { |
658 | /* fixed number of samples */ | 658 | /* fixed number of samples */ |
659 | this_usbduxsub->ao_sample_count--; | 659 | this_usbduxsub->ao_sample_count--; |
@@ -957,7 +957,7 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev, | |||
957 | if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) | 957 | if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) |
958 | err++; | 958 | err++; |
959 | 959 | ||
960 | /* scanning is continous */ | 960 | /* scanning is continuous */ |
961 | tmp = cmd->convert_src; | 961 | tmp = cmd->convert_src; |
962 | cmd->convert_src &= TRIG_NOW; | 962 | cmd->convert_src &= TRIG_NOW; |
963 | if (!cmd->convert_src || tmp != cmd->convert_src) | 963 | if (!cmd->convert_src || tmp != cmd->convert_src) |
@@ -1222,7 +1222,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1222 | up(&this_usbduxsub->sem); | 1222 | up(&this_usbduxsub->sem); |
1223 | return -EBUSY; | 1223 | return -EBUSY; |
1224 | } | 1224 | } |
1225 | /* set current channel of the running aquisition to zero */ | 1225 | /* set current channel of the running acquisition to zero */ |
1226 | s->async->cur_chan = 0; | 1226 | s->async->cur_chan = 0; |
1227 | 1227 | ||
1228 | this_usbduxsub->dux_commands[1] = cmd->chanlist_len; | 1228 | this_usbduxsub->dux_commands[1] = cmd->chanlist_len; |
@@ -1284,7 +1284,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1284 | this_usbduxsub->ai_sample_count = cmd->stop_arg; | 1284 | this_usbduxsub->ai_sample_count = cmd->stop_arg; |
1285 | this_usbduxsub->ai_continous = 0; | 1285 | this_usbduxsub->ai_continous = 0; |
1286 | } else { | 1286 | } else { |
1287 | /* continous aquisition */ | 1287 | /* continous acquisition */ |
1288 | this_usbduxsub->ai_continous = 1; | 1288 | this_usbduxsub->ai_continous = 1; |
1289 | this_usbduxsub->ai_sample_count = 0; | 1289 | this_usbduxsub->ai_sample_count = 0; |
1290 | } | 1290 | } |
@@ -1515,7 +1515,7 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev, | |||
1515 | /* just now we scan also in the high speed mode every frame */ | 1515 | /* just now we scan also in the high speed mode every frame */ |
1516 | /* this is due to ehci driver limitations */ | 1516 | /* this is due to ehci driver limitations */ |
1517 | if (0) { /* (this_usbduxsub->high_speed) */ | 1517 | if (0) { /* (this_usbduxsub->high_speed) */ |
1518 | /* start immidiately a new scan */ | 1518 | /* start immediately a new scan */ |
1519 | /* the sampling rate is set by the coversion rate */ | 1519 | /* the sampling rate is set by the coversion rate */ |
1520 | cmd->scan_begin_src &= TRIG_FOLLOW; | 1520 | cmd->scan_begin_src &= TRIG_FOLLOW; |
1521 | } else { | 1521 | } else { |
@@ -1525,7 +1525,7 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev, | |||
1525 | if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) | 1525 | if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) |
1526 | err++; | 1526 | err++; |
1527 | 1527 | ||
1528 | /* scanning is continous */ | 1528 | /* scanning is continuous */ |
1529 | tmp = cmd->convert_src; | 1529 | tmp = cmd->convert_src; |
1530 | /* we always output at 1kHz just now all channels at once */ | 1530 | /* we always output at 1kHz just now all channels at once */ |
1531 | if (0) { /* (this_usbduxsub->high_speed) */ | 1531 | if (0) { /* (this_usbduxsub->high_speed) */ |
@@ -1645,7 +1645,7 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1645 | dev_dbg(&this_usbduxsub->interface->dev, | 1645 | dev_dbg(&this_usbduxsub->interface->dev, |
1646 | "comedi%d: %s\n", dev->minor, __func__); | 1646 | "comedi%d: %s\n", dev->minor, __func__); |
1647 | 1647 | ||
1648 | /* set current channel of the running aquisition to zero */ | 1648 | /* set current channel of the running acquisition to zero */ |
1649 | s->async->cur_chan = 0; | 1649 | s->async->cur_chan = 0; |
1650 | for (i = 0; i < cmd->chanlist_len; ++i) { | 1650 | for (i = 0; i < cmd->chanlist_len; ++i) { |
1651 | chan = CR_CHAN(cmd->chanlist[i]); | 1651 | chan = CR_CHAN(cmd->chanlist[i]); |
@@ -1694,7 +1694,7 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1694 | this_usbduxsub->ao_counter = this_usbduxsub->ao_timer; | 1694 | this_usbduxsub->ao_counter = this_usbduxsub->ao_timer; |
1695 | 1695 | ||
1696 | if (cmd->stop_src == TRIG_COUNT) { | 1696 | if (cmd->stop_src == TRIG_COUNT) { |
1697 | /* not continous */ | 1697 | /* not continuous */ |
1698 | /* counter */ | 1698 | /* counter */ |
1699 | /* high speed also scans everything at once */ | 1699 | /* high speed also scans everything at once */ |
1700 | if (0) { /* (this_usbduxsub->high_speed) */ | 1700 | if (0) { /* (this_usbduxsub->high_speed) */ |
@@ -1708,7 +1708,7 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1708 | } | 1708 | } |
1709 | this_usbduxsub->ao_continous = 0; | 1709 | this_usbduxsub->ao_continous = 0; |
1710 | } else { | 1710 | } else { |
1711 | /* continous aquisition */ | 1711 | /* continous acquisition */ |
1712 | this_usbduxsub->ao_continous = 1; | 1712 | this_usbduxsub->ao_continous = 1; |
1713 | this_usbduxsub->ao_sample_count = 0; | 1713 | this_usbduxsub->ao_sample_count = 0; |
1714 | } | 1714 | } |
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c index 5b15e6df54e6..2a8e725b7859 100644 --- a/drivers/staging/comedi/drivers/usbduxfast.c +++ b/drivers/staging/comedi/drivers/usbduxfast.c | |||
@@ -180,7 +180,7 @@ struct usbduxfastsub_s { | |||
180 | /* comedi device for the interrupt context */ | 180 | /* comedi device for the interrupt context */ |
181 | struct comedi_device *comedidev; | 181 | struct comedi_device *comedidev; |
182 | short int ai_cmd_running; /* asynchronous command is running */ | 182 | short int ai_cmd_running; /* asynchronous command is running */ |
183 | short int ai_continous; /* continous aquisition */ | 183 | short int ai_continous; /* continous acquisition */ |
184 | long int ai_sample_count; /* number of samples to acquire */ | 184 | long int ai_sample_count; /* number of samples to acquire */ |
185 | uint8_t *dux_commands; /* commands */ | 185 | uint8_t *dux_commands; /* commands */ |
186 | int ignore; /* counter which ignores the first | 186 | int ignore; /* counter which ignores the first |
@@ -392,7 +392,7 @@ static void usbduxfastsub_ai_Irq(struct urb *urb) | |||
392 | p = urb->transfer_buffer; | 392 | p = urb->transfer_buffer; |
393 | if (!udfs->ignore) { | 393 | if (!udfs->ignore) { |
394 | if (!udfs->ai_continous) { | 394 | if (!udfs->ai_continous) { |
395 | /* not continous, fixed number of samples */ | 395 | /* not continuous, fixed number of samples */ |
396 | n = urb->actual_length / sizeof(uint16_t); | 396 | n = urb->actual_length / sizeof(uint16_t); |
397 | if (unlikely(udfs->ai_sample_count < n)) { | 397 | if (unlikely(udfs->ai_sample_count < n)) { |
398 | /* | 398 | /* |
@@ -775,7 +775,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, | |||
775 | up(&udfs->sem); | 775 | up(&udfs->sem); |
776 | return -EBUSY; | 776 | return -EBUSY; |
777 | } | 777 | } |
778 | /* set current channel of the running aquisition to zero */ | 778 | /* set current channel of the running acquisition to zero */ |
779 | s->async->cur_chan = 0; | 779 | s->async->cur_chan = 0; |
780 | 780 | ||
781 | /* | 781 | /* |
@@ -1182,7 +1182,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, | |||
1182 | } | 1182 | } |
1183 | udfs->ai_continous = 0; | 1183 | udfs->ai_continous = 0; |
1184 | } else { | 1184 | } else { |
1185 | /* continous aquisition */ | 1185 | /* continous acquisition */ |
1186 | udfs->ai_continous = 1; | 1186 | udfs->ai_continous = 1; |
1187 | udfs->ai_sample_count = 0; | 1187 | udfs->ai_sample_count = 0; |
1188 | } | 1188 | } |
diff --git a/drivers/staging/cptm1217/clearpad_tm1217.c b/drivers/staging/cptm1217/clearpad_tm1217.c index 76e4b782d2fb..0fe713e72e9d 100644 --- a/drivers/staging/cptm1217/clearpad_tm1217.c +++ b/drivers/staging/cptm1217/clearpad_tm1217.c | |||
@@ -52,7 +52,7 @@ | |||
52 | #define TMA1217_DEV_STATUS 0x13 /* Device Status */ | 52 | #define TMA1217_DEV_STATUS 0x13 /* Device Status */ |
53 | #define TMA1217_INT_STATUS 0x14 /* Interrupt Status */ | 53 | #define TMA1217_INT_STATUS 0x14 /* Interrupt Status */ |
54 | 54 | ||
55 | /* Controller can detect upto 2 possible finger touches. | 55 | /* Controller can detect up to 2 possible finger touches. |
56 | * Each finger touch provides 12 bit X Y co-ordinates, the values are split | 56 | * Each finger touch provides 12 bit X Y co-ordinates, the values are split |
57 | * across 2 registers, and an 8 bit Z value */ | 57 | * across 2 registers, and an 8 bit Z value */ |
58 | #define TMA1217_FINGER_STATE 0x18 /* Finger State */ | 58 | #define TMA1217_FINGER_STATE 0x18 /* Finger State */ |
diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c index 1429608544d6..3735ed3da4c6 100644 --- a/drivers/staging/crystalhd/crystalhd_cmds.c +++ b/drivers/staging/crystalhd/crystalhd_cmds.c | |||
@@ -914,7 +914,7 @@ enum BC_STATUS crystalhd_user_open(struct crystalhd_cmd *ctx, | |||
914 | * Return: | 914 | * Return: |
915 | * status | 915 | * status |
916 | * | 916 | * |
917 | * Closer aplication handle and release app specific | 917 | * Closer application handle and release app specific |
918 | * resources. | 918 | * resources. |
919 | */ | 919 | */ |
920 | enum BC_STATUS crystalhd_user_close(struct crystalhd_cmd *ctx, struct crystalhd_user *uc) | 920 | enum BC_STATUS crystalhd_user_close(struct crystalhd_cmd *ctx, struct crystalhd_user *uc) |
diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c index 13a514dd0f79..5acf39e7cdef 100644 --- a/drivers/staging/crystalhd/crystalhd_hw.c +++ b/drivers/staging/crystalhd/crystalhd_hw.c | |||
@@ -302,7 +302,7 @@ static bool crystalhd_start_device(struct crystalhd_adp *adp) | |||
302 | crystalhd_enable_interrupts(adp); | 302 | crystalhd_enable_interrupts(adp); |
303 | 303 | ||
304 | /* Enable the option for getting the total no. of DWORDS | 304 | /* Enable the option for getting the total no. of DWORDS |
305 | * that have been transfered by the RXDMA engine | 305 | * that have been transferred by the RXDMA engine |
306 | */ | 306 | */ |
307 | dbg_options = crystalhd_reg_rd(adp, MISC1_DMA_DEBUG_OPTIONS_REG); | 307 | dbg_options = crystalhd_reg_rd(adp, MISC1_DMA_DEBUG_OPTIONS_REG); |
308 | dbg_options |= 0x10; | 308 | dbg_options |= 0x10; |
@@ -1776,7 +1776,7 @@ enum BC_STATUS crystalhd_do_fw_cmd(struct crystalhd_hw *hw, | |||
1776 | return sts; | 1776 | return sts; |
1777 | } | 1777 | } |
1778 | 1778 | ||
1779 | /*Get the Responce Address*/ | 1779 | /*Get the Response Address*/ |
1780 | cmd_res_addr = bc_dec_reg_rd(hw->adp, Cpu2HstMbx1); | 1780 | cmd_res_addr = bc_dec_reg_rd(hw->adp, Cpu2HstMbx1); |
1781 | 1781 | ||
1782 | /*Read the Response*/ | 1782 | /*Read the Response*/ |
@@ -2367,7 +2367,7 @@ enum BC_STATUS crystalhd_hw_set_core_clock(struct crystalhd_hw *hw) | |||
2367 | BCMLOG(BCMLOG_INFO, "clock is moving to %d with n %d with vco_mg %d\n", | 2367 | BCMLOG(BCMLOG_INFO, "clock is moving to %d with n %d with vco_mg %d\n", |
2368 | hw->core_clock_mhz, n, vco_mg); | 2368 | hw->core_clock_mhz, n, vco_mg); |
2369 | 2369 | ||
2370 | /* Change the DRAM refresh rate to accomodate the new frequency */ | 2370 | /* Change the DRAM refresh rate to accommodate the new frequency */ |
2371 | /* refresh reg = ((refresh_rate * clock_rate)/16) - 1; rounding up*/ | 2371 | /* refresh reg = ((refresh_rate * clock_rate)/16) - 1; rounding up*/ |
2372 | refresh_reg = (7 * hw->core_clock_mhz / 16); | 2372 | refresh_reg = (7 * hw->core_clock_mhz / 16); |
2373 | bc_dec_reg_wr(hw->adp, SDRAM_REF_PARAM, ((1 << 12) | refresh_reg)); | 2373 | bc_dec_reg_wr(hw->adp, SDRAM_REF_PARAM, ((1 << 12) | refresh_reg)); |
diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c index f274c77fb3fc..5cc3423a6646 100644 --- a/drivers/staging/cxt1e1/musycc.c +++ b/drivers/staging/cxt1e1/musycc.c | |||
@@ -1455,7 +1455,7 @@ musycc_intr_bh_tasklet (ci_t * ci) | |||
1455 | /* | 1455 | /* |
1456 | * If the descriptor has not recovered, then leaving the EMPTY | 1456 | * If the descriptor has not recovered, then leaving the EMPTY |
1457 | * entry set will not signal to the MUSYCC that this descriptor | 1457 | * entry set will not signal to the MUSYCC that this descriptor |
1458 | * has been serviced. The Interrupt Queue can then start loosing | 1458 | * has been serviced. The Interrupt Queue can then start losing |
1459 | * available descriptors and MUSYCC eventually encounters and | 1459 | * available descriptors and MUSYCC eventually encounters and |
1460 | * reports the INTFULL condition. Per manual, changing any bit | 1460 | * reports the INTFULL condition. Per manual, changing any bit |
1461 | * marks descriptor as available, thus the use of different | 1461 | * marks descriptor as available, thus the use of different |
diff --git a/drivers/staging/cxt1e1/musycc.h b/drivers/staging/cxt1e1/musycc.h index d2c91ef686d1..68f3660f4477 100644 --- a/drivers/staging/cxt1e1/musycc.h +++ b/drivers/staging/cxt1e1/musycc.h | |||
@@ -74,7 +74,7 @@ extern "C" | |||
74 | 74 | ||
75 | #define INT_QUEUE_SIZE MUSYCC_NIQD | 75 | #define INT_QUEUE_SIZE MUSYCC_NIQD |
76 | 76 | ||
77 | /* RAM image of MUSYCC registers layed out as a C structure */ | 77 | /* RAM image of MUSYCC registers laid out as a C structure */ |
78 | struct musycc_groupr | 78 | struct musycc_groupr |
79 | { | 79 | { |
80 | VINT32 thp[32]; /* Transmit Head Pointer [5-29] */ | 80 | VINT32 thp[32]; /* Transmit Head Pointer [5-29] */ |
@@ -96,7 +96,7 @@ extern "C" | |||
96 | VINT32 pcd; /* Port Configuration Descriptor [5-19] */ | 96 | VINT32 pcd; /* Port Configuration Descriptor [5-19] */ |
97 | }; | 97 | }; |
98 | 98 | ||
99 | /* hardware MUSYCC registers layed out as a C structure */ | 99 | /* hardware MUSYCC registers laid out as a C structure */ |
100 | struct musycc_globalr | 100 | struct musycc_globalr |
101 | { | 101 | { |
102 | VINT32 gbp; /* Group Base Pointer */ | 102 | VINT32 gbp; /* Group Base Pointer */ |
diff --git a/drivers/staging/cxt1e1/pmcc4_defs.h b/drivers/staging/cxt1e1/pmcc4_defs.h index 186347b8d565..a39505f45c29 100644 --- a/drivers/staging/cxt1e1/pmcc4_defs.h +++ b/drivers/staging/cxt1e1/pmcc4_defs.h | |||
@@ -54,8 +54,8 @@ | |||
54 | #define MUSYCC_MTU 2048 /* default */ | 54 | #define MUSYCC_MTU 2048 /* default */ |
55 | #define MUSYCC_TXDESC_MIN 10 /* HDLC mode default */ | 55 | #define MUSYCC_TXDESC_MIN 10 /* HDLC mode default */ |
56 | #define MUSYCC_RXDESC_MIN 18 /* HDLC mode default */ | 56 | #define MUSYCC_RXDESC_MIN 18 /* HDLC mode default */ |
57 | #define MUSYCC_TXDESC_TRANS 4 /* Transparent mode minumum # of TX descriptors */ | 57 | #define MUSYCC_TXDESC_TRANS 4 /* Transparent mode minimum # of TX descriptors */ |
58 | #define MUSYCC_RXDESC_TRANS 12 /* Transparent mode minumum # of RX descriptors */ | 58 | #define MUSYCC_RXDESC_TRANS 12 /* Transparent mode minimum # of RX descriptors */ |
59 | 59 | ||
60 | #define MAX_DEFAULT_IFQLEN 32 /* network qlen */ | 60 | #define MAX_DEFAULT_IFQLEN 32 /* network qlen */ |
61 | 61 | ||
diff --git a/drivers/staging/cxt1e1/sbecrc.c b/drivers/staging/cxt1e1/sbecrc.c index 51232948091f..3f3cd60ac367 100644 --- a/drivers/staging/cxt1e1/sbecrc.c +++ b/drivers/staging/cxt1e1/sbecrc.c | |||
@@ -95,7 +95,7 @@ sbeCrc (u_int8_t *buffer, /* data buffer to crc */ | |||
95 | 95 | ||
96 | /* | 96 | /* |
97 | * if table not yet created, do so. Don't care about "extra" time | 97 | * if table not yet created, do so. Don't care about "extra" time |
98 | * checking this everytime sbeCrc() is called, since CRC calculations are | 98 | * checking this every time sbeCrc() is called, since CRC calculations are |
99 | * already time consuming | 99 | * already time consuming |
100 | */ | 100 | */ |
101 | if (!crcTableInit) | 101 | if (!crcTableInit) |
diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c index 70b9b33f3522..f42531c3d8da 100644 --- a/drivers/staging/cxt1e1/sbeproc.c +++ b/drivers/staging/cxt1e1/sbeproc.c | |||
@@ -239,7 +239,7 @@ sbecom_proc_get_sbe_info (char *buffer, char **start, off_t offset, | |||
239 | */ | 239 | */ |
240 | 240 | ||
241 | #if 1 | 241 | #if 1 |
242 | /* #4 - intepretation of above = set EOF, return len */ | 242 | /* #4 - interpretation of above = set EOF, return len */ |
243 | *eof = 1; | 243 | *eof = 1; |
244 | #endif | 244 | #endif |
245 | 245 | ||
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h index e6c8cb3828e9..425e9274f28a 100644 --- a/drivers/staging/et131x/et1310_address_map.h +++ b/drivers/staging/et131x/et1310_address_map.h | |||
@@ -856,7 +856,7 @@ typedef union _RXMAC_UNI_PF_ADDR3_t { | |||
856 | */ | 856 | */ |
857 | 857 | ||
858 | /* | 858 | /* |
859 | * structure for space availiable reg in rxmac address map. | 859 | * structure for space available reg in rxmac address map. |
860 | * located at address 0x4094 | 860 | * located at address 0x4094 |
861 | * | 861 | * |
862 | * 31-17: reserved | 862 | * 31-17: reserved |
@@ -1031,7 +1031,7 @@ typedef struct _RXMAC_t { /* Location: */ | |||
1031 | * 31: reset MII mgmt | 1031 | * 31: reset MII mgmt |
1032 | * 30-6: unused | 1032 | * 30-6: unused |
1033 | * 5: scan auto increment | 1033 | * 5: scan auto increment |
1034 | * 4: preamble supress | 1034 | * 4: preamble suppress |
1035 | * 3: undefined | 1035 | * 3: undefined |
1036 | * 2-0: mgmt clock reset | 1036 | * 2-0: mgmt clock reset |
1037 | */ | 1037 | */ |
diff --git a/drivers/staging/et131x/et1310_phy.h b/drivers/staging/et131x/et1310_phy.h index 78349adc7d8e..946c0c547404 100644 --- a/drivers/staging/et131x/et1310_phy.h +++ b/drivers/staging/et131x/et1310_phy.h | |||
@@ -468,7 +468,7 @@ typedef union _MI_ANAR_t { | |||
468 | #define TRUEPHY_ANEG_COMPLETE 1 | 468 | #define TRUEPHY_ANEG_COMPLETE 1 |
469 | #define TRUEPHY_ANEG_DISABLED 2 | 469 | #define TRUEPHY_ANEG_DISABLED 2 |
470 | 470 | ||
471 | /* Define duplex advertisment flags */ | 471 | /* Define duplex advertisement flags */ |
472 | #define TRUEPHY_ADV_DUPLEX_NONE 0x00 | 472 | #define TRUEPHY_ADV_DUPLEX_NONE 0x00 |
473 | #define TRUEPHY_ADV_DUPLEX_FULL 0x01 | 473 | #define TRUEPHY_ADV_DUPLEX_FULL 0x01 |
474 | #define TRUEPHY_ADV_DUPLEX_HALF 0x02 | 474 | #define TRUEPHY_ADV_DUPLEX_HALF 0x02 |
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c index 339136f64be1..fc6bd438366d 100644 --- a/drivers/staging/et131x/et1310_rx.c +++ b/drivers/staging/et131x/et1310_rx.c | |||
@@ -122,7 +122,7 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter) | |||
122 | * number of entries in FBR1. | 122 | * number of entries in FBR1. |
123 | * | 123 | * |
124 | * FBR1 holds "large" frames, FBR0 holds "small" frames. If FBR1 | 124 | * FBR1 holds "large" frames, FBR0 holds "small" frames. If FBR1 |
125 | * entries are huge in order to accomodate a "jumbo" frame, then it | 125 | * entries are huge in order to accommodate a "jumbo" frame, then it |
126 | * will have less entries. Conversely, FBR1 will now be relied upon | 126 | * will have less entries. Conversely, FBR1 will now be relied upon |
127 | * to carry more "normal" frames, thus it's entry size also increases | 127 | * to carry more "normal" frames, thus it's entry size also increases |
128 | * and the number of entries goes up too (since it now carries | 128 | * and the number of entries goes up too (since it now carries |
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c index ce4d93042679..f716e408712b 100644 --- a/drivers/staging/et131x/et131x_isr.c +++ b/drivers/staging/et131x/et131x_isr.c | |||
@@ -466,7 +466,7 @@ void et131x_isr_handler(struct work_struct *work) | |||
466 | /* Handle SLV Timeout Interrupt */ | 466 | /* Handle SLV Timeout Interrupt */ |
467 | if (status & ET_INTR_SLV_TIMEOUT) { | 467 | if (status & ET_INTR_SLV_TIMEOUT) { |
468 | /* | 468 | /* |
469 | * This means a timeout has occured on a read or | 469 | * This means a timeout has occurred on a read or |
470 | * write request to one of the JAGCore registers. The | 470 | * write request to one of the JAGCore registers. The |
471 | * Global Resources block has terminated the request | 471 | * Global Resources block has terminated the request |
472 | * and on a read request, returned a "fake" value. | 472 | * and on a read request, returned a "fake" value. |
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c index 0c298cae90d9..b25bae29042e 100644 --- a/drivers/staging/et131x/et131x_netdev.c +++ b/drivers/staging/et131x/et131x_netdev.c | |||
@@ -415,7 +415,7 @@ void et131x_multicast(struct net_device *netdev) | |||
415 | */ | 415 | */ |
416 | PacketFilter = adapter->PacketFilter; | 416 | PacketFilter = adapter->PacketFilter; |
417 | 417 | ||
418 | /* Clear the 'multicast' flag locally; becuase we only have a single | 418 | /* Clear the 'multicast' flag locally; because we only have a single |
419 | * flag to check multicast, and multiple multicast addresses can be | 419 | * flag to check multicast, and multiple multicast addresses can be |
420 | * set, this is the easiest way to determine if more than one | 420 | * set, this is the easiest way to determine if more than one |
421 | * multicast address is being set. | 421 | * multicast address is being set. |
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h index 4a89bd1bbf74..0b63f051f27c 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h | |||
@@ -30,7 +30,7 @@ | |||
30 | //--------------------------------------------------------------------------- | 30 | //--------------------------------------------------------------------------- |
31 | // | 31 | // |
32 | // Function: ft1000_read_reg | 32 | // Function: ft1000_read_reg |
33 | // Descripton: This function will read the value of a given ASIC register. | 33 | // Description: This function will read the value of a given ASIC register. |
34 | // Input: | 34 | // Input: |
35 | // dev - device structure | 35 | // dev - device structure |
36 | // offset - ASIC register offset | 36 | // offset - ASIC register offset |
@@ -49,7 +49,7 @@ static inline u16 ft1000_read_reg (struct net_device *dev, u16 offset) { | |||
49 | //--------------------------------------------------------------------------- | 49 | //--------------------------------------------------------------------------- |
50 | // | 50 | // |
51 | // Function: ft1000_write_reg | 51 | // Function: ft1000_write_reg |
52 | // Descripton: This function will set the value for a given ASIC register. | 52 | // Description: This function will set the value for a given ASIC register. |
53 | // Input: | 53 | // Input: |
54 | // dev - device structure | 54 | // dev - device structure |
55 | // offset - ASIC register offset | 55 | // offset - ASIC register offset |
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c index ff691d9b984e..eeb7dd43f9a8 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | |||
@@ -90,7 +90,7 @@ MODULE_SUPPORTED_DEVICE("FT1000"); | |||
90 | //--------------------------------------------------------------------------- | 90 | //--------------------------------------------------------------------------- |
91 | // | 91 | // |
92 | // Function: ft1000_asic_read | 92 | // Function: ft1000_asic_read |
93 | // Descripton: This function will retrieve the value of a specific ASIC | 93 | // Description: This function will retrieve the value of a specific ASIC |
94 | // register. | 94 | // register. |
95 | // Input: | 95 | // Input: |
96 | // dev - network device structure | 96 | // dev - network device structure |
@@ -107,7 +107,7 @@ inline u16 ft1000_asic_read(struct net_device *dev, u16 offset) | |||
107 | //--------------------------------------------------------------------------- | 107 | //--------------------------------------------------------------------------- |
108 | // | 108 | // |
109 | // Function: ft1000_asic_write | 109 | // Function: ft1000_asic_write |
110 | // Descripton: This function will set the value of a specific ASIC | 110 | // Description: This function will set the value of a specific ASIC |
111 | // register. | 111 | // register. |
112 | // Input: | 112 | // Input: |
113 | // dev - network device structure | 113 | // dev - network device structure |
@@ -124,7 +124,7 @@ inline void ft1000_asic_write(struct net_device *dev, u16 offset, u16 value) | |||
124 | //--------------------------------------------------------------------------- | 124 | //--------------------------------------------------------------------------- |
125 | // | 125 | // |
126 | // Function: ft1000_read_fifo_len | 126 | // Function: ft1000_read_fifo_len |
127 | // Descripton: This function will read the ASIC Uplink FIFO status register | 127 | // Description: This function will read the ASIC Uplink FIFO status register |
128 | // which will return the number of bytes remaining in the Uplink FIFO. | 128 | // which will return the number of bytes remaining in the Uplink FIFO. |
129 | // Sixteen bytes are subtracted to make sure that the ASIC does not | 129 | // Sixteen bytes are subtracted to make sure that the ASIC does not |
130 | // reach its threshold. | 130 | // reach its threshold. |
@@ -148,7 +148,7 @@ static inline u16 ft1000_read_fifo_len(struct net_device *dev) | |||
148 | //--------------------------------------------------------------------------- | 148 | //--------------------------------------------------------------------------- |
149 | // | 149 | // |
150 | // Function: ft1000_read_dpram | 150 | // Function: ft1000_read_dpram |
151 | // Descripton: This function will read the specific area of dpram | 151 | // Description: This function will read the specific area of dpram |
152 | // (Electrabuzz ASIC only) | 152 | // (Electrabuzz ASIC only) |
153 | // Input: | 153 | // Input: |
154 | // dev - device structure | 154 | // dev - device structure |
@@ -175,7 +175,7 @@ u16 ft1000_read_dpram(struct net_device * dev, int offset) | |||
175 | //--------------------------------------------------------------------------- | 175 | //--------------------------------------------------------------------------- |
176 | // | 176 | // |
177 | // Function: ft1000_write_dpram | 177 | // Function: ft1000_write_dpram |
178 | // Descripton: This function will write to a specific area of dpram | 178 | // Description: This function will write to a specific area of dpram |
179 | // (Electrabuzz ASIC only) | 179 | // (Electrabuzz ASIC only) |
180 | // Input: | 180 | // Input: |
181 | // dev - device structure | 181 | // dev - device structure |
@@ -201,7 +201,7 @@ static inline void ft1000_write_dpram(struct net_device *dev, | |||
201 | //--------------------------------------------------------------------------- | 201 | //--------------------------------------------------------------------------- |
202 | // | 202 | // |
203 | // Function: ft1000_read_dpram_mag_16 | 203 | // Function: ft1000_read_dpram_mag_16 |
204 | // Descripton: This function will read the specific area of dpram | 204 | // Description: This function will read the specific area of dpram |
205 | // (Magnemite ASIC only) | 205 | // (Magnemite ASIC only) |
206 | // Input: | 206 | // Input: |
207 | // dev - device structure | 207 | // dev - device structure |
@@ -233,7 +233,7 @@ u16 ft1000_read_dpram_mag_16(struct net_device *dev, int offset, int Index) | |||
233 | //--------------------------------------------------------------------------- | 233 | //--------------------------------------------------------------------------- |
234 | // | 234 | // |
235 | // Function: ft1000_write_dpram_mag_16 | 235 | // Function: ft1000_write_dpram_mag_16 |
236 | // Descripton: This function will write to a specific area of dpram | 236 | // Description: This function will write to a specific area of dpram |
237 | // (Magnemite ASIC only) | 237 | // (Magnemite ASIC only) |
238 | // Input: | 238 | // Input: |
239 | // dev - device structure | 239 | // dev - device structure |
@@ -263,7 +263,7 @@ static inline void ft1000_write_dpram_mag_16(struct net_device *dev, | |||
263 | //--------------------------------------------------------------------------- | 263 | //--------------------------------------------------------------------------- |
264 | // | 264 | // |
265 | // Function: ft1000_read_dpram_mag_32 | 265 | // Function: ft1000_read_dpram_mag_32 |
266 | // Descripton: This function will read the specific area of dpram | 266 | // Description: This function will read the specific area of dpram |
267 | // (Magnemite ASIC only) | 267 | // (Magnemite ASIC only) |
268 | // Input: | 268 | // Input: |
269 | // dev - device structure | 269 | // dev - device structure |
@@ -290,7 +290,7 @@ u32 ft1000_read_dpram_mag_32(struct net_device *dev, int offset) | |||
290 | //--------------------------------------------------------------------------- | 290 | //--------------------------------------------------------------------------- |
291 | // | 291 | // |
292 | // Function: ft1000_write_dpram_mag_32 | 292 | // Function: ft1000_write_dpram_mag_32 |
293 | // Descripton: This function will write to a specific area of dpram | 293 | // Description: This function will write to a specific area of dpram |
294 | // (Magnemite ASIC only) | 294 | // (Magnemite ASIC only) |
295 | // Input: | 295 | // Input: |
296 | // dev - device structure | 296 | // dev - device structure |
@@ -315,7 +315,7 @@ void ft1000_write_dpram_mag_32(struct net_device *dev, int offset, u32 value) | |||
315 | //--------------------------------------------------------------------------- | 315 | //--------------------------------------------------------------------------- |
316 | // | 316 | // |
317 | // Function: ft1000_enable_interrupts | 317 | // Function: ft1000_enable_interrupts |
318 | // Descripton: This function will enable interrupts base on the current interrupt mask. | 318 | // Description: This function will enable interrupts base on the current interrupt mask. |
319 | // Input: | 319 | // Input: |
320 | // dev - device structure | 320 | // dev - device structure |
321 | // Output: | 321 | // Output: |
@@ -340,7 +340,7 @@ static void ft1000_enable_interrupts(struct net_device *dev) | |||
340 | //--------------------------------------------------------------------------- | 340 | //--------------------------------------------------------------------------- |
341 | // | 341 | // |
342 | // Function: ft1000_disable_interrupts | 342 | // Function: ft1000_disable_interrupts |
343 | // Descripton: This function will disable all interrupts. | 343 | // Description: This function will disable all interrupts. |
344 | // Input: | 344 | // Input: |
345 | // dev - device structure | 345 | // dev - device structure |
346 | // Output: | 346 | // Output: |
@@ -364,7 +364,7 @@ static void ft1000_disable_interrupts(struct net_device *dev) | |||
364 | //--------------------------------------------------------------------------- | 364 | //--------------------------------------------------------------------------- |
365 | // | 365 | // |
366 | // Function: ft1000_reset_asic | 366 | // Function: ft1000_reset_asic |
367 | // Descripton: This function will call the Card Service function to reset the | 367 | // Description: This function will call the Card Service function to reset the |
368 | // ASIC. | 368 | // ASIC. |
369 | // Input: | 369 | // Input: |
370 | // dev - device structure | 370 | // dev - device structure |
@@ -408,7 +408,7 @@ static void ft1000_reset_asic(struct net_device *dev) | |||
408 | //--------------------------------------------------------------------------- | 408 | //--------------------------------------------------------------------------- |
409 | // | 409 | // |
410 | // Function: ft1000_reset_card | 410 | // Function: ft1000_reset_card |
411 | // Descripton: This function will reset the card | 411 | // Description: This function will reset the card |
412 | // Input: | 412 | // Input: |
413 | // dev - device structure | 413 | // dev - device structure |
414 | // Output: | 414 | // Output: |
@@ -571,7 +571,7 @@ static int ft1000_reset_card(struct net_device *dev) | |||
571 | //--------------------------------------------------------------------------- | 571 | //--------------------------------------------------------------------------- |
572 | // | 572 | // |
573 | // Function: ft1000_chkcard | 573 | // Function: ft1000_chkcard |
574 | // Descripton: This function will check if the device is presently available on | 574 | // Description: This function will check if the device is presently available on |
575 | // the system. | 575 | // the system. |
576 | // Input: | 576 | // Input: |
577 | // dev - device structure | 577 | // dev - device structure |
@@ -607,7 +607,7 @@ static int ft1000_chkcard(struct net_device *dev) | |||
607 | //--------------------------------------------------------------------------- | 607 | //--------------------------------------------------------------------------- |
608 | // | 608 | // |
609 | // Function: ft1000_hbchk | 609 | // Function: ft1000_hbchk |
610 | // Descripton: This function will perform the heart beat check of the DSP as | 610 | // Description: This function will perform the heart beat check of the DSP as |
611 | // well as the ASIC. | 611 | // well as the ASIC. |
612 | // Input: | 612 | // Input: |
613 | // dev - device structure | 613 | // dev - device structure |
@@ -828,7 +828,7 @@ static void ft1000_hbchk(u_long data) | |||
828 | //--------------------------------------------------------------------------- | 828 | //--------------------------------------------------------------------------- |
829 | // | 829 | // |
830 | // Function: ft1000_send_cmd | 830 | // Function: ft1000_send_cmd |
831 | // Descripton: | 831 | // Description: |
832 | // Input: | 832 | // Input: |
833 | // Output: | 833 | // Output: |
834 | // | 834 | // |
@@ -908,7 +908,7 @@ void ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qt | |||
908 | //--------------------------------------------------------------------------- | 908 | //--------------------------------------------------------------------------- |
909 | // | 909 | // |
910 | // Function: ft1000_receive_cmd | 910 | // Function: ft1000_receive_cmd |
911 | // Descripton: This function will read a message from the dpram area. | 911 | // Description: This function will read a message from the dpram area. |
912 | // Input: | 912 | // Input: |
913 | // dev - network device structure | 913 | // dev - network device structure |
914 | // pbuffer - caller supply address to buffer | 914 | // pbuffer - caller supply address to buffer |
@@ -1003,7 +1003,7 @@ BOOLEAN ft1000_receive_cmd(struct net_device *dev, u16 * pbuffer, int maxsz, u16 | |||
1003 | //--------------------------------------------------------------------------- | 1003 | //--------------------------------------------------------------------------- |
1004 | // | 1004 | // |
1005 | // Function: ft1000_proc_drvmsg | 1005 | // Function: ft1000_proc_drvmsg |
1006 | // Descripton: This function will process the various driver messages. | 1006 | // Description: This function will process the various driver messages. |
1007 | // Input: | 1007 | // Input: |
1008 | // dev - device structure | 1008 | // dev - device structure |
1009 | // pnxtph - pointer to next pseudo header | 1009 | // pnxtph - pointer to next pseudo header |
@@ -1285,7 +1285,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) | |||
1285 | //--------------------------------------------------------------------------- | 1285 | //--------------------------------------------------------------------------- |
1286 | // | 1286 | // |
1287 | // Function: ft1000_parse_dpram_msg | 1287 | // Function: ft1000_parse_dpram_msg |
1288 | // Descripton: This function will parse the message received from the DSP | 1288 | // Description: This function will parse the message received from the DSP |
1289 | // via the DPRAM interface. | 1289 | // via the DPRAM interface. |
1290 | // Input: | 1290 | // Input: |
1291 | // dev - device structure | 1291 | // dev - device structure |
@@ -1442,7 +1442,7 @@ int ft1000_parse_dpram_msg(struct net_device *dev) | |||
1442 | //--------------------------------------------------------------------------- | 1442 | //--------------------------------------------------------------------------- |
1443 | // | 1443 | // |
1444 | // Function: ft1000_flush_fifo | 1444 | // Function: ft1000_flush_fifo |
1445 | // Descripton: This function will flush one packet from the downlink | 1445 | // Description: This function will flush one packet from the downlink |
1446 | // FIFO. | 1446 | // FIFO. |
1447 | // Input: | 1447 | // Input: |
1448 | // dev - device structure | 1448 | // dev - device structure |
@@ -1587,7 +1587,7 @@ static void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum) | |||
1587 | //--------------------------------------------------------------------------- | 1587 | //--------------------------------------------------------------------------- |
1588 | // | 1588 | // |
1589 | // Function: ft1000_copy_up_pkt | 1589 | // Function: ft1000_copy_up_pkt |
1590 | // Descripton: This function will pull Flarion packets out of the Downlink | 1590 | // Description: This function will pull Flarion packets out of the Downlink |
1591 | // FIFO and convert it to an ethernet packet. The ethernet packet will | 1591 | // FIFO and convert it to an ethernet packet. The ethernet packet will |
1592 | // then be deliver to the TCP/IP stack. | 1592 | // then be deliver to the TCP/IP stack. |
1593 | // Input: | 1593 | // Input: |
@@ -1773,7 +1773,7 @@ int ft1000_copy_up_pkt(struct net_device *dev) | |||
1773 | //--------------------------------------------------------------------------- | 1773 | //--------------------------------------------------------------------------- |
1774 | // | 1774 | // |
1775 | // Function: ft1000_copy_down_pkt | 1775 | // Function: ft1000_copy_down_pkt |
1776 | // Descripton: This function will take an ethernet packet and convert it to | 1776 | // Description: This function will take an ethernet packet and convert it to |
1777 | // a Flarion packet prior to sending it to the ASIC Downlink | 1777 | // a Flarion packet prior to sending it to the ASIC Downlink |
1778 | // FIFO. | 1778 | // FIFO. |
1779 | // Input: | 1779 | // Input: |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c index 8e622425aa13..1972b72450d4 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c | |||
@@ -488,7 +488,7 @@ static int check_buffers(u16 *buff_w, u16 *buff_r, int len, int offset) | |||
488 | // Parameters: struct ft1000_device - device structure | 488 | // Parameters: struct ft1000_device - device structure |
489 | // u16 **pUsFile - DSP image file pointer in u16 | 489 | // u16 **pUsFile - DSP image file pointer in u16 |
490 | // u8 **pUcFile - DSP image file pointer in u8 | 490 | // u8 **pUcFile - DSP image file pointer in u8 |
491 | // long word_length - lenght of the buffer to be written | 491 | // long word_length - length of the buffer to be written |
492 | // to DPRAM | 492 | // to DPRAM |
493 | // | 493 | // |
494 | // Returns: STATUS_SUCCESS - success | 494 | // Returns: STATUS_SUCCESS - success |
@@ -628,7 +628,7 @@ static void usb_dnld_complete (struct urb *urb) | |||
628 | // Parameters: struct ft1000_device - device structure | 628 | // Parameters: struct ft1000_device - device structure |
629 | // u16 **pUsFile - DSP image file pointer in u16 | 629 | // u16 **pUsFile - DSP image file pointer in u16 |
630 | // u8 **pUcFile - DSP image file pointer in u8 | 630 | // u8 **pUcFile - DSP image file pointer in u8 |
631 | // long word_length - lenght of the buffer to be written | 631 | // long word_length - length of the buffer to be written |
632 | // to DPRAM | 632 | // to DPRAM |
633 | // | 633 | // |
634 | // Returns: STATUS_SUCCESS - success | 634 | // Returns: STATUS_SUCCESS - success |
@@ -817,7 +817,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, | |||
817 | * Error, beyond boot code range. | 817 | * Error, beyond boot code range. |
818 | */ | 818 | */ |
819 | DEBUG | 819 | DEBUG |
820 | ("FT1000:download:Download error: Requested len=%d exceeds BOOT code boundry.\n", | 820 | ("FT1000:download:Download error: Requested len=%d exceeds BOOT code boundary.\n", |
821 | (int)word_length); | 821 | (int)word_length); |
822 | status = STATUS_FAILURE; | 822 | status = STATUS_FAILURE; |
823 | break; | 823 | break; |
@@ -950,7 +950,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, | |||
950 | * Error, beyond boot code range. | 950 | * Error, beyond boot code range. |
951 | */ | 951 | */ |
952 | DEBUG | 952 | DEBUG |
953 | ("FT1000:download:Download error: Requested len=%d exceeds DSP code boundry.\n", | 953 | ("FT1000:download:Download error: Requested len=%d exceeds DSP code boundary.\n", |
954 | (int)word_length); | 954 | (int)word_length); |
955 | status = STATUS_FAILURE; | 955 | status = STATUS_FAILURE; |
956 | break; | 956 | break; |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index 78dcd49bb985..684e69eacb71 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | |||
@@ -585,7 +585,7 @@ int dsp_reload(struct ft1000_device *ft1000dev) | |||
585 | //--------------------------------------------------------------------------- | 585 | //--------------------------------------------------------------------------- |
586 | // | 586 | // |
587 | // Function: ft1000_reset_asic | 587 | // Function: ft1000_reset_asic |
588 | // Descripton: This function will call the Card Service function to reset the | 588 | // Description: This function will call the Card Service function to reset the |
589 | // ASIC. | 589 | // ASIC. |
590 | // Input: | 590 | // Input: |
591 | // dev - device structure | 591 | // dev - device structure |
@@ -626,7 +626,7 @@ static void ft1000_reset_asic(struct net_device *dev) | |||
626 | //--------------------------------------------------------------------------- | 626 | //--------------------------------------------------------------------------- |
627 | // | 627 | // |
628 | // Function: ft1000_reset_card | 628 | // Function: ft1000_reset_card |
629 | // Descripton: This function will reset the card | 629 | // Description: This function will reset the card |
630 | // Input: | 630 | // Input: |
631 | // dev - device structure | 631 | // dev - device structure |
632 | // Output: | 632 | // Output: |
@@ -917,7 +917,7 @@ static void ft1000_usb_transmit_complete(struct urb *urb) | |||
917 | //--------------------------------------------------------------------------- | 917 | //--------------------------------------------------------------------------- |
918 | // | 918 | // |
919 | // Function: ft1000_copy_down_pkt | 919 | // Function: ft1000_copy_down_pkt |
920 | // Descripton: This function will take an ethernet packet and convert it to | 920 | // Description: This function will take an ethernet packet and convert it to |
921 | // a Flarion packet prior to sending it to the ASIC Downlink | 921 | // a Flarion packet prior to sending it to the ASIC Downlink |
922 | // FIFO. | 922 | // FIFO. |
923 | // Input: | 923 | // Input: |
@@ -1075,10 +1075,10 @@ err: | |||
1075 | //--------------------------------------------------------------------------- | 1075 | //--------------------------------------------------------------------------- |
1076 | // | 1076 | // |
1077 | // Function: ft1000_copy_up_pkt | 1077 | // Function: ft1000_copy_up_pkt |
1078 | // Descripton: This function will take a packet from the FIFO up link and | 1078 | // Description: This function will take a packet from the FIFO up link and |
1079 | // convert it into an ethernet packet and deliver it to the IP stack | 1079 | // convert it into an ethernet packet and deliver it to the IP stack |
1080 | // Input: | 1080 | // Input: |
1081 | // urb - the receving usb urb | 1081 | // urb - the receiving usb urb |
1082 | // | 1082 | // |
1083 | // Output: | 1083 | // Output: |
1084 | // status - FAILURE | 1084 | // status - FAILURE |
@@ -1182,7 +1182,7 @@ static int ft1000_copy_up_pkt(struct urb *urb) | |||
1182 | //--------------------------------------------------------------------------- | 1182 | //--------------------------------------------------------------------------- |
1183 | // | 1183 | // |
1184 | // Function: ft1000_submit_rx_urb | 1184 | // Function: ft1000_submit_rx_urb |
1185 | // Descripton: the receiving function of the network driver | 1185 | // Description: the receiving function of the network driver |
1186 | // | 1186 | // |
1187 | // Input: | 1187 | // Input: |
1188 | // info - a private structure contains the device information | 1188 | // info - a private structure contains the device information |
@@ -1316,7 +1316,7 @@ Jim | |||
1316 | //--------------------------------------------------------------------------- | 1316 | //--------------------------------------------------------------------------- |
1317 | // | 1317 | // |
1318 | // Function: ft1000_chkcard | 1318 | // Function: ft1000_chkcard |
1319 | // Descripton: This function will check if the device is presently available on | 1319 | // Description: This function will check if the device is presently available on |
1320 | // the system. | 1320 | // the system. |
1321 | // Input: | 1321 | // Input: |
1322 | // dev - device structure | 1322 | // dev - device structure |
@@ -1363,7 +1363,7 @@ static int ft1000_chkcard(struct ft1000_device *dev) | |||
1363 | //--------------------------------------------------------------------------- | 1363 | //--------------------------------------------------------------------------- |
1364 | // | 1364 | // |
1365 | // Function: ft1000_receive_cmd | 1365 | // Function: ft1000_receive_cmd |
1366 | // Descripton: This function will read a message from the dpram area. | 1366 | // Description: This function will read a message from the dpram area. |
1367 | // Input: | 1367 | // Input: |
1368 | // dev - network device structure | 1368 | // dev - network device structure |
1369 | // pbuffer - caller supply address to buffer | 1369 | // pbuffer - caller supply address to buffer |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h b/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h index 3f72d5bb3f92..6a8a1969f9e1 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | |||
@@ -55,7 +55,7 @@ struct pseudo_hdr { | |||
55 | unsigned char seq_num; //sequence number | 55 | unsigned char seq_num; //sequence number |
56 | unsigned char rsvd2; //reserved | 56 | unsigned char rsvd2; //reserved |
57 | unsigned short qos_class; //Quality of Service class (Not applicable on Mobile) | 57 | unsigned short qos_class; //Quality of Service class (Not applicable on Mobile) |
58 | unsigned short checksum; //Psuedo header checksum | 58 | unsigned short checksum; //Pseudo header checksum |
59 | } __attribute__ ((packed)); | 59 | } __attribute__ ((packed)); |
60 | 60 | ||
61 | typedef struct _IOCTL_GET_VER | 61 | typedef struct _IOCTL_GET_VER |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h index e047c03fbf3a..f2ecb3eae9cd 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | |||
@@ -364,7 +364,7 @@ struct prov_record { | |||
364 | 364 | ||
365 | #define ISR_EMPTY (u8)0x00 // no bits set in ISR | 365 | #define ISR_EMPTY (u8)0x00 // no bits set in ISR |
366 | 366 | ||
367 | #define ISR_DOORBELL_ACK (u8)0x01 // the doorbell i sent has been recieved. | 367 | #define ISR_DOORBELL_ACK (u8)0x01 // the doorbell i sent has been received. |
368 | 368 | ||
369 | #define ISR_DOORBELL_PEND (u8)0x02 // doorbell for me | 369 | #define ISR_DOORBELL_PEND (u8)0x02 // doorbell for me |
370 | 370 | ||
diff --git a/drivers/staging/generic_serial/generic_serial.c b/drivers/staging/generic_serial/generic_serial.c index 466988dbc37d..f29dda4e9f20 100644 --- a/drivers/staging/generic_serial/generic_serial.c +++ b/drivers/staging/generic_serial/generic_serial.c | |||
@@ -113,7 +113,7 @@ int gs_write(struct tty_struct * tty, | |||
113 | 113 | ||
114 | c = count; | 114 | c = count; |
115 | 115 | ||
116 | /* This is safe because we "OWN" the "head". Noone else can | 116 | /* This is safe because we "OWN" the "head". No one else can |
117 | change the "head": we own the port_write_mutex. */ | 117 | change the "head": we own the port_write_mutex. */ |
118 | /* Don't overrun the end of the buffer */ | 118 | /* Don't overrun the end of the buffer */ |
119 | t = SERIAL_XMIT_SIZE - port->xmit_head; | 119 | t = SERIAL_XMIT_SIZE - port->xmit_head; |
diff --git a/drivers/staging/generic_serial/rio/map.h b/drivers/staging/generic_serial/rio/map.h index 8366978578c1..28a66129293e 100644 --- a/drivers/staging/generic_serial/rio/map.h +++ b/drivers/staging/generic_serial/rio/map.h | |||
@@ -87,7 +87,7 @@ struct Map { | |||
87 | ** The Topology array contains the ID of the unit connected to each of the | 87 | ** The Topology array contains the ID of the unit connected to each of the |
88 | ** four links on this unit. The entry will be 0xFFFF if NOTHING is connected | 88 | ** four links on this unit. The entry will be 0xFFFF if NOTHING is connected |
89 | ** to the link, or will be 0xFF00 if an UNKNOWN unit is connected to the link. | 89 | ** to the link, or will be 0xFF00 if an UNKNOWN unit is connected to the link. |
90 | ** The Name field is a null-terminated string, upto 31 characters, containing | 90 | ** The Name field is a null-terminated string, up to 31 characters, containing |
91 | ** the 'cute' name that the sysadmin/users know the RTA by. It is permissible | 91 | ** the 'cute' name that the sysadmin/users know the RTA by. It is permissible |
92 | ** for this string to contain any character in the range \040 to \176 inclusive. | 92 | ** for this string to contain any character in the range \040 to \176 inclusive. |
93 | ** In particular, ctrl sequences and DEL (0x7F, \177) are not allowed. The | 93 | ** In particular, ctrl sequences and DEL (0x7F, \177) are not allowed. The |
diff --git a/drivers/staging/generic_serial/rio/rioboot.c b/drivers/staging/generic_serial/rio/rioboot.c index d956dd316005..ffa01c590216 100644 --- a/drivers/staging/generic_serial/rio/rioboot.c +++ b/drivers/staging/generic_serial/rio/rioboot.c | |||
@@ -109,7 +109,7 @@ int RIOBootCodeRTA(struct rio_info *p, struct DownLoad * rbp) | |||
109 | rio_dprintk(RIO_DEBUG_BOOT, "Data at user address %p\n", rbp->DataP); | 109 | rio_dprintk(RIO_DEBUG_BOOT, "Data at user address %p\n", rbp->DataP); |
110 | 110 | ||
111 | /* | 111 | /* |
112 | ** Check that we have set asside enough memory for this | 112 | ** Check that we have set aside enough memory for this |
113 | */ | 113 | */ |
114 | if (rbp->Count > SIXTY_FOUR_K) { | 114 | if (rbp->Count > SIXTY_FOUR_K) { |
115 | rio_dprintk(RIO_DEBUG_BOOT, "RTA Boot Code Too Large!\n"); | 115 | rio_dprintk(RIO_DEBUG_BOOT, "RTA Boot Code Too Large!\n"); |
@@ -293,7 +293,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
293 | /* | 293 | /* |
294 | ** S T O P ! | 294 | ** S T O P ! |
295 | ** | 295 | ** |
296 | ** Upto this point the code has been fairly rational, and possibly | 296 | ** Up to this point the code has been fairly rational, and possibly |
297 | ** even straight forward. What follows is a pile of crud that will | 297 | ** even straight forward. What follows is a pile of crud that will |
298 | ** magically turn into six bytes of transputer assembler. Normally | 298 | ** magically turn into six bytes of transputer assembler. Normally |
299 | ** you would expect an array or something, but, being me, I have | 299 | ** you would expect an array or something, but, being me, I have |
@@ -419,7 +419,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
419 | rio_dprintk(RIO_DEBUG_BOOT, "Set control port\n"); | 419 | rio_dprintk(RIO_DEBUG_BOOT, "Set control port\n"); |
420 | 420 | ||
421 | /* | 421 | /* |
422 | ** Now, wait for upto five seconds for the Tp to setup the parmmap | 422 | ** Now, wait for up to five seconds for the Tp to setup the parmmap |
423 | ** pointer: | 423 | ** pointer: |
424 | */ | 424 | */ |
425 | for (wait_count = 0; (wait_count < p->RIOConf.StartupTime) && (readw(&HostP->__ParmMapR) == OldParmMap); wait_count++) { | 425 | for (wait_count = 0; (wait_count < p->RIOConf.StartupTime) && (readw(&HostP->__ParmMapR) == OldParmMap); wait_count++) { |
@@ -475,7 +475,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
475 | 475 | ||
476 | /* | 476 | /* |
477 | ** now wait for the card to set all the parmmap->XXX stuff | 477 | ** now wait for the card to set all the parmmap->XXX stuff |
478 | ** this is a wait of upto two seconds.... | 478 | ** this is a wait of up to two seconds.... |
479 | */ | 479 | */ |
480 | rio_dprintk(RIO_DEBUG_BOOT, "Looking for init_done - %d ticks\n", p->RIOConf.StartupTime); | 480 | rio_dprintk(RIO_DEBUG_BOOT, "Looking for init_done - %d ticks\n", p->RIOConf.StartupTime); |
481 | HostP->timeout_id = 0; | 481 | HostP->timeout_id = 0; |
diff --git a/drivers/staging/generic_serial/rio/riocmd.c b/drivers/staging/generic_serial/rio/riocmd.c index f121357e5af0..61efd538e850 100644 --- a/drivers/staging/generic_serial/rio/riocmd.c +++ b/drivers/staging/generic_serial/rio/riocmd.c | |||
@@ -863,7 +863,7 @@ int RIOUnUse(unsigned long iPortP, struct CmdBlk *CmdBlkP) | |||
863 | ** being transferred from the write queue into the transmit packets | 863 | ** being transferred from the write queue into the transmit packets |
864 | ** (add_transmit) and no furthur transmit interrupt will be sent for that | 864 | ** (add_transmit) and no furthur transmit interrupt will be sent for that |
865 | ** data. The next interrupt will occur up to 500ms later (RIOIntr is called | 865 | ** data. The next interrupt will occur up to 500ms later (RIOIntr is called |
866 | ** twice a second as a saftey measure). This was the case when kermit was | 866 | ** twice a second as a safety measure). This was the case when kermit was |
867 | ** used to send data into a RIO port. After each packet was sent, TCFLSH | 867 | ** used to send data into a RIO port. After each packet was sent, TCFLSH |
868 | ** was called to flush the read queue preemptively. PortP->InUse was | 868 | ** was called to flush the read queue preemptively. PortP->InUse was |
869 | ** incremented, thereby blocking the 6 byte acknowledgement packet | 869 | ** incremented, thereby blocking the 6 byte acknowledgement packet |
diff --git a/drivers/staging/generic_serial/rio/rioroute.c b/drivers/staging/generic_serial/rio/rioroute.c index f9b936ac3394..8757378e8320 100644 --- a/drivers/staging/generic_serial/rio/rioroute.c +++ b/drivers/staging/generic_serial/rio/rioroute.c | |||
@@ -450,7 +450,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct | |||
450 | ** we reset the unit, because we didn't boot it. | 450 | ** we reset the unit, because we didn't boot it. |
451 | ** However, if the table is full, it could be that we did boot | 451 | ** However, if the table is full, it could be that we did boot |
452 | ** this unit, and so we won't reboot it, because it isn't really | 452 | ** this unit, and so we won't reboot it, because it isn't really |
453 | ** all that disasterous to keep the old bins in most cases. This | 453 | ** all that disastrous to keep the old bins in most cases. This |
454 | ** is a rather tacky feature, but we are on the edge of reallity | 454 | ** is a rather tacky feature, but we are on the edge of reallity |
455 | ** here, because the implication is that someone has connected | 455 | ** here, because the implication is that someone has connected |
456 | ** 16+MAX_EXTRA_UNITS onto one host. | 456 | ** 16+MAX_EXTRA_UNITS onto one host. |
@@ -678,7 +678,7 @@ static int RIOCheck(struct Host *HostP, unsigned int UnitId) | |||
678 | 678 | ||
679 | HostP->Mapping[UnitId].Flags &= ~BEEN_HERE; | 679 | HostP->Mapping[UnitId].Flags &= ~BEEN_HERE; |
680 | 680 | ||
681 | /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d DOESNT KNOW THE HOST!\n", UnitId)); */ | 681 | /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d DOESN'T KNOW THE HOST!\n", UnitId)); */ |
682 | 682 | ||
683 | return 0; | 683 | return 0; |
684 | } | 684 | } |
diff --git a/drivers/staging/generic_serial/rio/riotty.c b/drivers/staging/generic_serial/rio/riotty.c index 8a90393faf3c..e7e9911d7a72 100644 --- a/drivers/staging/generic_serial/rio/riotty.c +++ b/drivers/staging/generic_serial/rio/riotty.c | |||
@@ -124,7 +124,7 @@ int riotopen(struct tty_struct *tty, struct file *filp) | |||
124 | } | 124 | } |
125 | 125 | ||
126 | /* | 126 | /* |
127 | ** Grab pointer to the port stucture | 127 | ** Grab pointer to the port structure |
128 | */ | 128 | */ |
129 | PortP = p->RIOPortp[SysPort]; /* Get control struc */ | 129 | PortP = p->RIOPortp[SysPort]; /* Get control struc */ |
130 | rio_dprintk(RIO_DEBUG_TTY, "PortP: %p\n", PortP); | 130 | rio_dprintk(RIO_DEBUG_TTY, "PortP: %p\n", PortP); |
@@ -161,7 +161,7 @@ int riotopen(struct tty_struct *tty, struct file *filp) | |||
161 | } | 161 | } |
162 | 162 | ||
163 | /* | 163 | /* |
164 | ** If the RTA has not booted yet and the user has choosen to block | 164 | ** If the RTA has not booted yet and the user has chosen to block |
165 | ** until the RTA is present then we must spin here waiting for | 165 | ** until the RTA is present then we must spin here waiting for |
166 | ** the RTA to boot. | 166 | ** the RTA to boot. |
167 | */ | 167 | */ |
diff --git a/drivers/staging/generic_serial/sx.c b/drivers/staging/generic_serial/sx.c index 1291462bcddb..4f94aaffbe83 100644 --- a/drivers/staging/generic_serial/sx.c +++ b/drivers/staging/generic_serial/sx.c | |||
@@ -158,13 +158,13 @@ | |||
158 | * Readying for release on 2.0.x (sorry David, 1.01 becomes 1.1 for RCS). | 158 | * Readying for release on 2.0.x (sorry David, 1.01 becomes 1.1 for RCS). |
159 | * | 159 | * |
160 | * Revision 0.12 1999/03/28 09:20:10 wolff | 160 | * Revision 0.12 1999/03/28 09:20:10 wolff |
161 | * Fixed problem in 0.11, continueing cleanup. | 161 | * Fixed problem in 0.11, continuing cleanup. |
162 | * | 162 | * |
163 | * Revision 0.11 1999/03/28 08:46:44 wolff | 163 | * Revision 0.11 1999/03/28 08:46:44 wolff |
164 | * cleanup. Not good. | 164 | * cleanup. Not good. |
165 | * | 165 | * |
166 | * Revision 0.10 1999/03/28 08:09:43 wolff | 166 | * Revision 0.10 1999/03/28 08:09:43 wolff |
167 | * Fixed loosing characters on close. | 167 | * Fixed losing characters on close. |
168 | * | 168 | * |
169 | * Revision 0.9 1999/03/21 22:52:01 wolff | 169 | * Revision 0.9 1999/03/21 22:52:01 wolff |
170 | * Ported back to 2.2.... (minor things) | 170 | * Ported back to 2.2.... (minor things) |
@@ -1588,7 +1588,7 @@ static void sx_close(void *ptr) | |||
1588 | #define R0 if (read_sx_byte(board, i) != 0x55) return 1 | 1588 | #define R0 if (read_sx_byte(board, i) != 0x55) return 1 |
1589 | #define R1 if (read_sx_byte(board, i) != 0xaa) return 1 | 1589 | #define R1 if (read_sx_byte(board, i) != 0xaa) return 1 |
1590 | 1590 | ||
1591 | /* This memtest takes a human-noticable time. You normally only do it | 1591 | /* This memtest takes a human-noticeable time. You normally only do it |
1592 | once a boot, so I guess that it is worth it. */ | 1592 | once a boot, so I guess that it is worth it. */ |
1593 | static int do_memtest(struct sx_board *board, int min, int max) | 1593 | static int do_memtest(struct sx_board *board, int min, int max) |
1594 | { | 1594 | { |
@@ -1645,7 +1645,7 @@ static int do_memtest(struct sx_board *board, int min, int max) | |||
1645 | #define R1 if (read_sx_word(board, i) != 0xaa55) return 1 | 1645 | #define R1 if (read_sx_word(board, i) != 0xaa55) return 1 |
1646 | 1646 | ||
1647 | #if 0 | 1647 | #if 0 |
1648 | /* This memtest takes a human-noticable time. You normally only do it | 1648 | /* This memtest takes a human-noticeable time. You normally only do it |
1649 | once a boot, so I guess that it is worth it. */ | 1649 | once a boot, so I guess that it is worth it. */ |
1650 | static int do_memtest_w(struct sx_board *board, int min, int max) | 1650 | static int do_memtest_w(struct sx_board *board, int min, int max) |
1651 | { | 1651 | { |
diff --git a/drivers/staging/gma500/psb_drm.h b/drivers/staging/gma500/psb_drm.h index fb9b4245bada..a339406052ef 100644 --- a/drivers/staging/gma500/psb_drm.h +++ b/drivers/staging/gma500/psb_drm.h | |||
@@ -131,7 +131,7 @@ struct drm_psb_reloc { | |||
131 | u32 pre_add; /* Destination format: */ | 131 | u32 pre_add; /* Destination format: */ |
132 | u32 background; /* Destination add */ | 132 | u32 background; /* Destination add */ |
133 | u32 dst_buffer; /* Destination buffer. Index into buffer_list */ | 133 | u32 dst_buffer; /* Destination buffer. Index into buffer_list */ |
134 | u32 arg0; /* Reloc-op dependant */ | 134 | u32 arg0; /* Reloc-op dependent */ |
135 | u32 arg1; | 135 | u32 arg1; |
136 | }; | 136 | }; |
137 | 137 | ||
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index 44cd095d2862..d01d45e7a14d 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c | |||
@@ -561,7 +561,7 @@ static int psb_driver_unload(struct drm_device *dev) | |||
561 | kfree(dev_priv); | 561 | kfree(dev_priv); |
562 | dev->dev_private = NULL; | 562 | dev->dev_private = NULL; |
563 | 563 | ||
564 | /*destory VBT data*/ | 564 | /*destroy VBT data*/ |
565 | psb_intel_destroy_bios(dev); | 565 | psb_intel_destroy_bios(dev); |
566 | } | 566 | } |
567 | 567 | ||
diff --git a/drivers/staging/gma500/psb_intel_bios.c b/drivers/staging/gma500/psb_intel_bios.c index f5bcd119b87d..48ac8ba7f40b 100644 --- a/drivers/staging/gma500/psb_intel_bios.c +++ b/drivers/staging/gma500/psb_intel_bios.c | |||
@@ -271,7 +271,7 @@ bool psb_intel_init_bios(struct drm_device *dev) | |||
271 | } | 271 | } |
272 | 272 | ||
273 | /** | 273 | /** |
274 | * Destory and free VBT data | 274 | * Destroy and free VBT data |
275 | */ | 275 | */ |
276 | void psb_intel_destroy_bios(struct drm_device *dev) | 276 | void psb_intel_destroy_bios(struct drm_device *dev) |
277 | { | 277 | { |
diff --git a/drivers/staging/gma500/psb_intel_sdvo.c b/drivers/staging/gma500/psb_intel_sdvo.c index 731a5a2261d3..1d2bb021c0a5 100644 --- a/drivers/staging/gma500/psb_intel_sdvo.c +++ b/drivers/staging/gma500/psb_intel_sdvo.c | |||
@@ -573,7 +573,7 @@ static bool psb_sdvo_set_current_inoutmap(struct psb_intel_output *output, | |||
573 | /* Make all fields of the args/ret to zero */ | 573 | /* Make all fields of the args/ret to zero */ |
574 | memset(byArgs, 0, sizeof(byArgs)); | 574 | memset(byArgs, 0, sizeof(byArgs)); |
575 | 575 | ||
576 | /* Fill up the arguement values; */ | 576 | /* Fill up the argument values; */ |
577 | byArgs[0] = (u8) (in0outputmask & 0xFF); | 577 | byArgs[0] = (u8) (in0outputmask & 0xFF); |
578 | byArgs[1] = (u8) ((in0outputmask >> 8) & 0xFF); | 578 | byArgs[1] = (u8) ((in0outputmask >> 8) & 0xFF); |
579 | byArgs[2] = (u8) (in1outputmask & 0xFF); | 579 | byArgs[2] = (u8) (in1outputmask & 0xFF); |
diff --git a/drivers/staging/gma500/psb_intel_sdvo_regs.h b/drivers/staging/gma500/psb_intel_sdvo_regs.h index a1d1475a9315..c7107a37e33d 100644 --- a/drivers/staging/gma500/psb_intel_sdvo_regs.h +++ b/drivers/staging/gma500/psb_intel_sdvo_regs.h | |||
@@ -217,7 +217,7 @@ struct psb_intel_sdvo_set_target_input_args { | |||
217 | } __attribute__ ((packed)); | 217 | } __attribute__ ((packed)); |
218 | 218 | ||
219 | /** | 219 | /** |
220 | * Takes a struct psb_intel_sdvo_output_flags of which outputs are targetted by | 220 | * Takes a struct psb_intel_sdvo_output_flags of which outputs are targeted by |
221 | * future output commands. | 221 | * future output commands. |
222 | * | 222 | * |
223 | * Affected commands inclue SET_OUTPUT_TIMINGS_PART[12], | 223 | * Affected commands inclue SET_OUTPUT_TIMINGS_PART[12], |
diff --git a/drivers/staging/gma500/psb_ttm_fence_user.h b/drivers/staging/gma500/psb_ttm_fence_user.h index fc13f89c6e12..762a05728632 100644 --- a/drivers/staging/gma500/psb_ttm_fence_user.h +++ b/drivers/staging/gma500/psb_ttm_fence_user.h | |||
@@ -130,7 +130,7 @@ struct ttm_fence_unref_arg { | |||
130 | }; | 130 | }; |
131 | 131 | ||
132 | /* | 132 | /* |
133 | * Ioctl offsets frome extenstion start. | 133 | * Ioctl offsets from extenstion start. |
134 | */ | 134 | */ |
135 | 135 | ||
136 | #define TTM_FENCE_SIGNALED 0x01 | 136 | #define TTM_FENCE_SIGNALED 0x01 |
diff --git a/drivers/staging/go7007/go7007.txt b/drivers/staging/go7007/go7007.txt index 06a76da32128..9db1f3952fd2 100644 --- a/drivers/staging/go7007/go7007.txt +++ b/drivers/staging/go7007/go7007.txt | |||
@@ -2,7 +2,7 @@ This is a driver for the WIS GO7007SB multi-format video encoder. | |||
2 | 2 | ||
3 | Pete Eberlein <pete@sensoray.com> | 3 | Pete Eberlein <pete@sensoray.com> |
4 | 4 | ||
5 | The driver was orignally released under the GPL and is currently hosted at: | 5 | The driver was originally released under the GPL and is currently hosted at: |
6 | http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver | 6 | http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver |
7 | The go7007 firmware can be acquired from the package on the site above. | 7 | The go7007 firmware can be acquired from the package on the site above. |
8 | 8 | ||
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index af789937be4e..68ad17d67098 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c | |||
@@ -894,7 +894,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req, | |||
894 | 894 | ||
895 | /* | 895 | /* |
896 | * We break the request into 1 or more blkvsc_requests and submit | 896 | * We break the request into 1 or more blkvsc_requests and submit |
897 | * them. If we cant submit them all, we put them on the | 897 | * them. If we can't submit them all, we put them on the |
898 | * pending_list. The blkvsc_request() will work on the pending_list. | 898 | * pending_list. The blkvsc_request() will work on the pending_list. |
899 | */ | 899 | */ |
900 | static int blkvsc_do_request(struct block_device_context *blkdev, | 900 | static int blkvsc_do_request(struct block_device_context *blkdev, |
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c index bc0393a41d29..06b573227e8d 100644 --- a/drivers/staging/hv/channel_mgmt.c +++ b/drivers/staging/hv/channel_mgmt.c | |||
@@ -166,7 +166,7 @@ EXPORT_SYMBOL(prep_negotiate_resp); | |||
166 | * from Hyper-V. This stub responds to the default negotiate messages | 166 | * from Hyper-V. This stub responds to the default negotiate messages |
167 | * that come in for every non IDE/SCSI/Network request. | 167 | * that come in for every non IDE/SCSI/Network request. |
168 | * This behavior is normally overwritten in the hv_utils driver. That | 168 | * This behavior is normally overwritten in the hv_utils driver. That |
169 | * driver handles requests like gracefull shutdown, heartbeats etc. | 169 | * driver handles requests like graceful shutdown, heartbeats etc. |
170 | * | 170 | * |
171 | * Mainly used by Hyper-V drivers. | 171 | * Mainly used by Hyper-V drivers. |
172 | */ | 172 | */ |
diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c index 2d492adb95bb..0b06f4fe5838 100644 --- a/drivers/staging/hv/hv.c +++ b/drivers/staging/hv/hv.c | |||
@@ -37,7 +37,7 @@ struct hv_context hv_context = { | |||
37 | 37 | ||
38 | /* | 38 | /* |
39 | * query_hypervisor_presence | 39 | * query_hypervisor_presence |
40 | * - Query the cpuid for presense of windows hypervisor | 40 | * - Query the cpuid for presence of windows hypervisor |
41 | */ | 41 | */ |
42 | static int query_hypervisor_presence(void) | 42 | static int query_hypervisor_presence(void) |
43 | { | 43 | { |
diff --git a/drivers/staging/hv/hv_api.h b/drivers/staging/hv/hv_api.h index 7114fceab21e..43a722888dc4 100644 --- a/drivers/staging/hv/hv_api.h +++ b/drivers/staging/hv/hv_api.h | |||
@@ -53,14 +53,14 @@ struct hv_guid { | |||
53 | 53 | ||
54 | /* | 54 | /* |
55 | * HV_STATUS_INVALID_ALIGNMENT | 55 | * HV_STATUS_INVALID_ALIGNMENT |
56 | * The hypervisor could not perform the operation beacuse a parameter has an | 56 | * The hypervisor could not perform the operation because a parameter has an |
57 | * invalid alignment. | 57 | * invalid alignment. |
58 | */ | 58 | */ |
59 | #define HV_STATUS_INVALID_ALIGNMENT ((u16)0x0004) | 59 | #define HV_STATUS_INVALID_ALIGNMENT ((u16)0x0004) |
60 | 60 | ||
61 | /* | 61 | /* |
62 | * HV_STATUS_INVALID_PARAMETER | 62 | * HV_STATUS_INVALID_PARAMETER |
63 | * The hypervisor could not perform the operation beacuse an invalid parameter | 63 | * The hypervisor could not perform the operation because an invalid parameter |
64 | * was specified. | 64 | * was specified. |
65 | */ | 65 | */ |
66 | #define HV_STATUS_INVALID_PARAMETER ((u16)0x0005) | 66 | #define HV_STATUS_INVALID_PARAMETER ((u16)0x0005) |
diff --git a/drivers/staging/hv/hv_kvp.h b/drivers/staging/hv/hv_kvp.h index e069f59b5135..8c402f357d37 100644 --- a/drivers/staging/hv/hv_kvp.h +++ b/drivers/staging/hv/hv_kvp.h | |||
@@ -36,7 +36,7 @@ | |||
36 | * registry. | 36 | * registry. |
37 | * | 37 | * |
38 | * Note: This value is used in defining the KVP exchange message - this value | 38 | * Note: This value is used in defining the KVP exchange message - this value |
39 | * cannot be modified without affecting the message size and compatability. | 39 | * cannot be modified without affecting the message size and compatibility. |
40 | */ | 40 | */ |
41 | 41 | ||
42 | /* | 42 | /* |
diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c index 4792f2c402b2..2df15683f8fa 100644 --- a/drivers/staging/hv/hv_util.c +++ b/drivers/staging/hv/hv_util.c | |||
@@ -80,7 +80,7 @@ static void shutdown_onchannelcallback(void *context) | |||
80 | execute_shutdown = true; | 80 | execute_shutdown = true; |
81 | 81 | ||
82 | DPRINT_INFO(VMBUS, "Shutdown request received -" | 82 | DPRINT_INFO(VMBUS, "Shutdown request received -" |
83 | " gracefull shutdown initiated"); | 83 | " graceful shutdown initiated"); |
84 | break; | 84 | break; |
85 | default: | 85 | default: |
86 | icmsghdrp->status = HV_E_FAIL; | 86 | icmsghdrp->status = HV_E_FAIL; |
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c index e7189cd324ca..048376b2b676 100644 --- a/drivers/staging/hv/rndis_filter.c +++ b/drivers/staging/hv/rndis_filter.c | |||
@@ -585,7 +585,7 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev, | |||
585 | ret = -1; | 585 | ret = -1; |
586 | DPRINT_ERR(NETVSC, "timeout before we got a set response..."); | 586 | DPRINT_ERR(NETVSC, "timeout before we got a set response..."); |
587 | /* | 587 | /* |
588 | * We cant deallocate the request since we may still receive a | 588 | * We can't deallocate the request since we may still receive a |
589 | * send completion for it. | 589 | * send completion for it. |
590 | */ | 590 | */ |
591 | goto Exit; | 591 | goto Exit; |
diff --git a/drivers/staging/hv/tools/hv_kvp_daemon.c b/drivers/staging/hv/tools/hv_kvp_daemon.c index f5a2dd694611..aa77a971aace 100644 --- a/drivers/staging/hv/tools/hv_kvp_daemon.c +++ b/drivers/staging/hv/tools/hv_kvp_daemon.c | |||
@@ -202,7 +202,7 @@ kvp_get_ip_address(int family, char *buffer, int length) | |||
202 | 202 | ||
203 | /* | 203 | /* |
204 | * We only support AF_INET and AF_INET6 | 204 | * We only support AF_INET and AF_INET6 |
205 | * and the list of addresses is seperated by a ";". | 205 | * and the list of addresses is separated by a ";". |
206 | */ | 206 | */ |
207 | struct sockaddr_in6 *addr = | 207 | struct sockaddr_in6 *addr = |
208 | (struct sockaddr_in6 *) curp->ifa_addr; | 208 | (struct sockaddr_in6 *) curp->ifa_addr; |
diff --git a/drivers/staging/iio/Documentation/iio_utils.h b/drivers/staging/iio/Documentation/iio_utils.h index 8095727b3966..fd78e4ff99ae 100644 --- a/drivers/staging/iio/Documentation/iio_utils.h +++ b/drivers/staging/iio/Documentation/iio_utils.h | |||
@@ -556,7 +556,7 @@ int _write_sysfs_string(char *filename, char *basedir, char *val, int verify) | |||
556 | if (strcmp(temp, val) != 0) { | 556 | if (strcmp(temp, val) != 0) { |
557 | printf("Possible failure in string write of %s " | 557 | printf("Possible failure in string write of %s " |
558 | "Should be %s " | 558 | "Should be %s " |
559 | "writen to %s\%s\n", | 559 | "written to %s\%s\n", |
560 | temp, | 560 | temp, |
561 | val, | 561 | val, |
562 | basedir, | 562 | basedir, |
diff --git a/drivers/staging/iio/accel/adis16201.h b/drivers/staging/iio/accel/adis16201.h index c9bf22c13428..23fe54d09d12 100644 --- a/drivers/staging/iio/accel/adis16201.h +++ b/drivers/staging/iio/accel/adis16201.h | |||
@@ -70,7 +70,7 @@ | |||
70 | * @indio_dev: industrial I/O device structure | 70 | * @indio_dev: industrial I/O device structure |
71 | * @trig: data ready trigger registered with iio | 71 | * @trig: data ready trigger registered with iio |
72 | * @tx: transmit buffer | 72 | * @tx: transmit buffer |
73 | * @rx: recieve buffer | 73 | * @rx: receive buffer |
74 | * @buf_lock: mutex to protect tx and rx | 74 | * @buf_lock: mutex to protect tx and rx |
75 | **/ | 75 | **/ |
76 | struct adis16201_state { | 76 | struct adis16201_state { |
diff --git a/drivers/staging/iio/accel/adis16203.h b/drivers/staging/iio/accel/adis16203.h index b39323eac9e3..b88688128d61 100644 --- a/drivers/staging/iio/accel/adis16203.h +++ b/drivers/staging/iio/accel/adis16203.h | |||
@@ -65,7 +65,7 @@ | |||
65 | * @indio_dev: industrial I/O device structure | 65 | * @indio_dev: industrial I/O device structure |
66 | * @trig: data ready trigger registered with iio | 66 | * @trig: data ready trigger registered with iio |
67 | * @tx: transmit buffer | 67 | * @tx: transmit buffer |
68 | * @rx: recieve buffer | 68 | * @rx: receive buffer |
69 | * @buf_lock: mutex to protect tx and rx | 69 | * @buf_lock: mutex to protect tx and rx |
70 | **/ | 70 | **/ |
71 | struct adis16203_state { | 71 | struct adis16203_state { |
diff --git a/drivers/staging/iio/accel/adis16204.h b/drivers/staging/iio/accel/adis16204.h index e9ed7cb048cf..e61844684f99 100644 --- a/drivers/staging/iio/accel/adis16204.h +++ b/drivers/staging/iio/accel/adis16204.h | |||
@@ -73,7 +73,7 @@ | |||
73 | * @indio_dev: industrial I/O device structure | 73 | * @indio_dev: industrial I/O device structure |
74 | * @trig: data ready trigger registered with iio | 74 | * @trig: data ready trigger registered with iio |
75 | * @tx: transmit buffer | 75 | * @tx: transmit buffer |
76 | * @rx: recieve buffer | 76 | * @rx: receive buffer |
77 | * @buf_lock: mutex to protect tx and rx | 77 | * @buf_lock: mutex to protect tx and rx |
78 | **/ | 78 | **/ |
79 | struct adis16204_state { | 79 | struct adis16204_state { |
diff --git a/drivers/staging/iio/accel/adis16209.h b/drivers/staging/iio/accel/adis16209.h index 4e97596620ef..8b0da1349555 100644 --- a/drivers/staging/iio/accel/adis16209.h +++ b/drivers/staging/iio/accel/adis16209.h | |||
@@ -109,7 +109,7 @@ | |||
109 | * @indio_dev: industrial I/O device structure | 109 | * @indio_dev: industrial I/O device structure |
110 | * @trig: data ready trigger registered with iio | 110 | * @trig: data ready trigger registered with iio |
111 | * @tx: transmit buffer | 111 | * @tx: transmit buffer |
112 | * @rx: recieve buffer | 112 | * @rx: receive buffer |
113 | * @buf_lock: mutex to protect tx and rx | 113 | * @buf_lock: mutex to protect tx and rx |
114 | **/ | 114 | **/ |
115 | struct adis16209_state { | 115 | struct adis16209_state { |
diff --git a/drivers/staging/iio/accel/adis16220.h b/drivers/staging/iio/accel/adis16220.h index 7013314a9d77..4d5758c2c047 100644 --- a/drivers/staging/iio/accel/adis16220.h +++ b/drivers/staging/iio/accel/adis16220.h | |||
@@ -132,7 +132,7 @@ | |||
132 | * @indio_dev: industrial I/O device structure | 132 | * @indio_dev: industrial I/O device structure |
133 | * @trig: data ready trigger registered with iio | 133 | * @trig: data ready trigger registered with iio |
134 | * @tx: transmit buffer | 134 | * @tx: transmit buffer |
135 | * @rx: recieve buffer | 135 | * @rx: receive buffer |
136 | * @buf_lock: mutex to protect tx and rx | 136 | * @buf_lock: mutex to protect tx and rx |
137 | **/ | 137 | **/ |
138 | struct adis16220_state { | 138 | struct adis16220_state { |
diff --git a/drivers/staging/iio/accel/adis16240.h b/drivers/staging/iio/accel/adis16240.h index 51a807dde27c..76a45797b9dd 100644 --- a/drivers/staging/iio/accel/adis16240.h +++ b/drivers/staging/iio/accel/adis16240.h | |||
@@ -132,7 +132,7 @@ | |||
132 | * @indio_dev: industrial I/O device structure | 132 | * @indio_dev: industrial I/O device structure |
133 | * @trig: data ready trigger registered with iio | 133 | * @trig: data ready trigger registered with iio |
134 | * @tx: transmit buffer | 134 | * @tx: transmit buffer |
135 | * @rx: recieve buffer | 135 | * @rx: receive buffer |
136 | * @buf_lock: mutex to protect tx and rx | 136 | * @buf_lock: mutex to protect tx and rx |
137 | **/ | 137 | **/ |
138 | struct adis16240_state { | 138 | struct adis16240_state { |
diff --git a/drivers/staging/iio/accel/lis3l02dq.h b/drivers/staging/iio/accel/lis3l02dq.h index 579b3a26e5d7..11402187f9ae 100644 --- a/drivers/staging/iio/accel/lis3l02dq.h +++ b/drivers/staging/iio/accel/lis3l02dq.h | |||
@@ -57,7 +57,7 @@ | |||
57 | /* Reboot memory content */ | 57 | /* Reboot memory content */ |
58 | #define LIS3L02DQ_REG_CTRL_2_REBOOT_MEMORY 0x10 | 58 | #define LIS3L02DQ_REG_CTRL_2_REBOOT_MEMORY 0x10 |
59 | 59 | ||
60 | /* Interupt Enable - applies data ready to the RDY pad */ | 60 | /* Interrupt Enable - applies data ready to the RDY pad */ |
61 | #define LIS3L02DQ_REG_CTRL_2_ENABLE_INTERRUPT 0x08 | 61 | #define LIS3L02DQ_REG_CTRL_2_ENABLE_INTERRUPT 0x08 |
62 | 62 | ||
63 | /* Enable Data Ready Generation - relationship with previous unclear in docs */ | 63 | /* Enable Data Ready Generation - relationship with previous unclear in docs */ |
@@ -70,34 +70,34 @@ | |||
70 | * - option for 16 bit left justified */ | 70 | * - option for 16 bit left justified */ |
71 | #define LIS3L02DQ_REG_CTRL_2_DATA_ALIGNMENT_16_BIT_LEFT_JUSTIFIED 0x01 | 71 | #define LIS3L02DQ_REG_CTRL_2_DATA_ALIGNMENT_16_BIT_LEFT_JUSTIFIED 0x01 |
72 | 72 | ||
73 | /* Interupt related stuff */ | 73 | /* Interrupt related stuff */ |
74 | #define LIS3L02DQ_REG_WAKE_UP_CFG_ADDR 0x23 | 74 | #define LIS3L02DQ_REG_WAKE_UP_CFG_ADDR 0x23 |
75 | 75 | ||
76 | /* Switch from or combination fo conditions to and */ | 76 | /* Switch from or combination fo conditions to and */ |
77 | #define LIS3L02DQ_REG_WAKE_UP_CFG_BOOLEAN_AND 0x80 | 77 | #define LIS3L02DQ_REG_WAKE_UP_CFG_BOOLEAN_AND 0x80 |
78 | 78 | ||
79 | /* Latch interupt request, | 79 | /* Latch interrupt request, |
80 | * if on ack must be given by reading the ack register */ | 80 | * if on ack must be given by reading the ack register */ |
81 | #define LIS3L02DQ_REG_WAKE_UP_CFG_LATCH_SRC 0x40 | 81 | #define LIS3L02DQ_REG_WAKE_UP_CFG_LATCH_SRC 0x40 |
82 | 82 | ||
83 | /* Z Interupt on High (above threshold)*/ | 83 | /* Z Interrupt on High (above threshold)*/ |
84 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Z_HIGH 0x20 | 84 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Z_HIGH 0x20 |
85 | /* Z Interupt on Low */ | 85 | /* Z Interrupt on Low */ |
86 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Z_LOW 0x10 | 86 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Z_LOW 0x10 |
87 | /* Y Interupt on High */ | 87 | /* Y Interrupt on High */ |
88 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Y_HIGH 0x08 | 88 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Y_HIGH 0x08 |
89 | /* Y Interupt on Low */ | 89 | /* Y Interrupt on Low */ |
90 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Y_LOW 0x04 | 90 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Y_LOW 0x04 |
91 | /* X Interupt on High */ | 91 | /* X Interrupt on High */ |
92 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_X_HIGH 0x02 | 92 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_X_HIGH 0x02 |
93 | /* X Interupt on Low */ | 93 | /* X Interrupt on Low */ |
94 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_X_LOW 0x01 | 94 | #define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_X_LOW 0x01 |
95 | 95 | ||
96 | /* Register that gives description of what caused interupt | 96 | /* Register that gives description of what caused interrupt |
97 | * - latched if set in CFG_ADDRES */ | 97 | * - latched if set in CFG_ADDRES */ |
98 | #define LIS3L02DQ_REG_WAKE_UP_SRC_ADDR 0x24 | 98 | #define LIS3L02DQ_REG_WAKE_UP_SRC_ADDR 0x24 |
99 | /* top bit ignored */ | 99 | /* top bit ignored */ |
100 | /* Interupt Active */ | 100 | /* Interrupt Active */ |
101 | #define LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_ACTIVATED 0x40 | 101 | #define LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_ACTIVATED 0x40 |
102 | /* Interupts that have been triggered */ | 102 | /* Interupts that have been triggered */ |
103 | #define LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_HIGH 0x20 | 103 | #define LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_HIGH 0x20 |
@@ -123,7 +123,7 @@ | |||
123 | #define LIS3L02DQ_REG_STATUS_X_NEW_DATA 0x01 | 123 | #define LIS3L02DQ_REG_STATUS_X_NEW_DATA 0x01 |
124 | 124 | ||
125 | /* The accelerometer readings - low and high bytes. | 125 | /* The accelerometer readings - low and high bytes. |
126 | Form of high byte dependant on justification set in ctrl reg */ | 126 | Form of high byte dependent on justification set in ctrl reg */ |
127 | #define LIS3L02DQ_REG_OUT_X_L_ADDR 0x28 | 127 | #define LIS3L02DQ_REG_OUT_X_L_ADDR 0x28 |
128 | #define LIS3L02DQ_REG_OUT_X_H_ADDR 0x29 | 128 | #define LIS3L02DQ_REG_OUT_X_H_ADDR 0x29 |
129 | #define LIS3L02DQ_REG_OUT_Y_L_ADDR 0x2A | 129 | #define LIS3L02DQ_REG_OUT_Y_L_ADDR 0x2A |
@@ -155,7 +155,7 @@ Form of high byte dependant on justification set in ctrl reg */ | |||
155 | * @inter: used to check if new interrupt has been triggered | 155 | * @inter: used to check if new interrupt has been triggered |
156 | * @trig: data ready trigger registered with iio | 156 | * @trig: data ready trigger registered with iio |
157 | * @tx: transmit buffer | 157 | * @tx: transmit buffer |
158 | * @rx: recieve buffer | 158 | * @rx: receive buffer |
159 | * @buf_lock: mutex to protect tx and rx | 159 | * @buf_lock: mutex to protect tx and rx |
160 | **/ | 160 | **/ |
161 | struct lis3l02dq_state { | 161 | struct lis3l02dq_state { |
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c index c4b4ab7e6423..3067f9662d20 100644 --- a/drivers/staging/iio/accel/lis3l02dq_core.c +++ b/drivers/staging/iio/accel/lis3l02dq_core.c | |||
@@ -77,7 +77,7 @@ int lis3l02dq_spi_read_reg_8(struct device *dev, u8 reg_address, u8 *val) | |||
77 | /** | 77 | /** |
78 | * lis3l02dq_spi_write_reg_8() - write single byte to a register | 78 | * lis3l02dq_spi_write_reg_8() - write single byte to a register |
79 | * @dev: device associated with child of actual device (iio_dev or iio_trig) | 79 | * @dev: device associated with child of actual device (iio_dev or iio_trig) |
80 | * @reg_address: the address of the register to be writen | 80 | * @reg_address: the address of the register to be written |
81 | * @val: the value to write | 81 | * @val: the value to write |
82 | **/ | 82 | **/ |
83 | int lis3l02dq_spi_write_reg_8(struct device *dev, | 83 | int lis3l02dq_spi_write_reg_8(struct device *dev, |
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index 2c461a31f129..529a3cc6d0c7 100644 --- a/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c | |||
@@ -217,7 +217,7 @@ static const u8 read_all_tx_array[] = { | |||
217 | /** | 217 | /** |
218 | * lis3l02dq_read_all() Reads all channels currently selected | 218 | * lis3l02dq_read_all() Reads all channels currently selected |
219 | * @st: device specific state | 219 | * @st: device specific state |
220 | * @rx_array: (dma capable) recieve array, must be at least | 220 | * @rx_array: (dma capable) receive array, must be at least |
221 | * 4*number of channels | 221 | * 4*number of channels |
222 | **/ | 222 | **/ |
223 | static int lis3l02dq_read_all(struct lis3l02dq_state *st, u8 *rx_array) | 223 | static int lis3l02dq_read_all(struct lis3l02dq_state *st, u8 *rx_array) |
@@ -409,7 +409,7 @@ static const struct attribute_group lis3l02dq_trigger_attr_group = { | |||
409 | * | 409 | * |
410 | * As the trigger may occur on any data element being updated it is | 410 | * As the trigger may occur on any data element being updated it is |
411 | * really rather likely to occur during the read from the previous | 411 | * really rather likely to occur during the read from the previous |
412 | * trigger event. The only way to discover if this has occured on | 412 | * trigger event. The only way to discover if this has occurred on |
413 | * boards not supporting level interrupts is to take a look at the line. | 413 | * boards not supporting level interrupts is to take a look at the line. |
414 | * If it is indicating another interrupt and we don't seem to have a | 414 | * If it is indicating another interrupt and we don't seem to have a |
415 | * handler looking at it, then we need to notify the core that we need | 415 | * handler looking at it, then we need to notify the core that we need |
diff --git a/drivers/staging/iio/accel/sca3000.h b/drivers/staging/iio/accel/sca3000.h index 23892848f5ae..db710334b99b 100644 --- a/drivers/staging/iio/accel/sca3000.h +++ b/drivers/staging/iio/accel/sca3000.h | |||
@@ -185,7 +185,7 @@ struct sca3000_state { | |||
185 | }; | 185 | }; |
186 | 186 | ||
187 | /** | 187 | /** |
188 | * struct sca3000_chip_info - model dependant parameters | 188 | * struct sca3000_chip_info - model dependent parameters |
189 | * @name: model identification | 189 | * @name: model identification |
190 | * @scale: string containing floating point scale factor | 190 | * @scale: string containing floating point scale factor |
191 | * @temp_output: some devices have temperature sensors. | 191 | * @temp_output: some devices have temperature sensors. |
@@ -213,7 +213,7 @@ struct sca3000_chip_info { | |||
213 | * sca3000_read_data() read a series of values from the device | 213 | * sca3000_read_data() read a series of values from the device |
214 | * @dev: device | 214 | * @dev: device |
215 | * @reg_address_high: start address (decremented read) | 215 | * @reg_address_high: start address (decremented read) |
216 | * @rx: pointer where recieved data is placed. Callee | 216 | * @rx: pointer where received data is placed. Callee |
217 | * responsible for freeing this. | 217 | * responsible for freeing this. |
218 | * @len: number of bytes to read | 218 | * @len: number of bytes to read |
219 | * | 219 | * |
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c index c872fddfb2bf..a730a7638de1 100644 --- a/drivers/staging/iio/accel/sca3000_ring.c +++ b/drivers/staging/iio/accel/sca3000_ring.c | |||
@@ -43,7 +43,7 @@ | |||
43 | * leading byte used in bus comms. | 43 | * leading byte used in bus comms. |
44 | * | 44 | * |
45 | * Currently does not provide timestamps. As the hardware doesn't add them they | 45 | * Currently does not provide timestamps. As the hardware doesn't add them they |
46 | * can only be inferred aproximately from ring buffer events such as 50% full | 46 | * can only be inferred approximately from ring buffer events such as 50% full |
47 | * and knowledge of when buffer was last emptied. This is left to userspace. | 47 | * and knowledge of when buffer was last emptied. This is left to userspace. |
48 | **/ | 48 | **/ |
49 | static int sca3000_rip_hw_rb(struct iio_ring_buffer *r, | 49 | static int sca3000_rip_hw_rb(struct iio_ring_buffer *r, |
diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c index 19d1aced1e6c..9068d7f54d15 100644 --- a/drivers/staging/iio/adc/ad7298_ring.c +++ b/drivers/staging/iio/adc/ad7298_ring.c | |||
@@ -157,7 +157,7 @@ static int ad7298_ring_preenable(struct iio_dev *indio_dev) | |||
157 | /** | 157 | /** |
158 | * ad7298_poll_func_th() th of trigger launched polling to ring buffer | 158 | * ad7298_poll_func_th() th of trigger launched polling to ring buffer |
159 | * | 159 | * |
160 | * As sampling only occurs on spi comms occuring, leave timestamping until | 160 | * As sampling only occurs on spi comms occurring, leave timestamping until |
161 | * then. Some triggers will generate their own time stamp. Currently | 161 | * then. Some triggers will generate their own time stamp. Currently |
162 | * there is no way of notifying them when no one cares. | 162 | * there is no way of notifying them when no one cares. |
163 | **/ | 163 | **/ |
diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c index 1d654c86099d..92d93787d5b8 100644 --- a/drivers/staging/iio/adc/ad7476_ring.c +++ b/drivers/staging/iio/adc/ad7476_ring.c | |||
@@ -112,7 +112,7 @@ static int ad7476_ring_preenable(struct iio_dev *indio_dev) | |||
112 | /** | 112 | /** |
113 | * ad7476_poll_func_th() th of trigger launched polling to ring buffer | 113 | * ad7476_poll_func_th() th of trigger launched polling to ring buffer |
114 | * | 114 | * |
115 | * As sampling only occurs on i2c comms occuring, leave timestamping until | 115 | * As sampling only occurs on i2c comms occurring, leave timestamping until |
116 | * then. Some triggers will generate their own time stamp. Currently | 116 | * then. Some triggers will generate their own time stamp. Currently |
117 | * there is no way of notifying them when no one cares. | 117 | * there is no way of notifying them when no one cares. |
118 | **/ | 118 | **/ |
diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c index 2d7fe65049dd..da77f266c16b 100644 --- a/drivers/staging/iio/adc/ad7887_ring.c +++ b/drivers/staging/iio/adc/ad7887_ring.c | |||
@@ -165,7 +165,7 @@ static int ad7887_ring_postdisable(struct iio_dev *indio_dev) | |||
165 | /** | 165 | /** |
166 | * ad7887_poll_func_th() th of trigger launched polling to ring buffer | 166 | * ad7887_poll_func_th() th of trigger launched polling to ring buffer |
167 | * | 167 | * |
168 | * As sampling only occurs on spi comms occuring, leave timestamping until | 168 | * As sampling only occurs on spi comms occurring, leave timestamping until |
169 | * then. Some triggers will generate their own time stamp. Currently | 169 | * then. Some triggers will generate their own time stamp. Currently |
170 | * there is no way of notifying them when no one cares. | 170 | * there is no way of notifying them when no one cares. |
171 | **/ | 171 | **/ |
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c index e50841b3ac69..f04e642e7272 100644 --- a/drivers/staging/iio/adc/ad799x_core.c +++ b/drivers/staging/iio/adc/ad799x_core.c | |||
@@ -184,7 +184,7 @@ static ssize_t ad799x_read_single_channel(struct device *dev, | |||
184 | 184 | ||
185 | mutex_lock(&dev_info->mlock); | 185 | mutex_lock(&dev_info->mlock); |
186 | mask = 1 << this_attr->address; | 186 | mask = 1 << this_attr->address; |
187 | /* If ring buffer capture is occuring, query the buffer */ | 187 | /* If ring buffer capture is occurring, query the buffer */ |
188 | if (iio_ring_enabled(dev_info)) { | 188 | if (iio_ring_enabled(dev_info)) { |
189 | data = ret = ad799x_single_channel_from_ring(st, mask); | 189 | data = ret = ad799x_single_channel_from_ring(st, mask); |
190 | if (ret < 0) | 190 | if (ret < 0) |
diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c index 56abc395f177..0875a7ef67a5 100644 --- a/drivers/staging/iio/adc/ad799x_ring.c +++ b/drivers/staging/iio/adc/ad799x_ring.c | |||
@@ -101,7 +101,7 @@ static int ad799x_ring_preenable(struct iio_dev *indio_dev) | |||
101 | /** | 101 | /** |
102 | * ad799x_poll_func_th() th of trigger launched polling to ring buffer | 102 | * ad799x_poll_func_th() th of trigger launched polling to ring buffer |
103 | * | 103 | * |
104 | * As sampling only occurs on i2c comms occuring, leave timestamping until | 104 | * As sampling only occurs on i2c comms occurring, leave timestamping until |
105 | * then. Some triggers will generate their own time stamp. Currently | 105 | * then. Some triggers will generate their own time stamp. Currently |
106 | * there is no way of notifying them when no one cares. | 106 | * there is no way of notifying them when no one cares. |
107 | **/ | 107 | **/ |
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c index dde097afb430..de83c3b37a2d 100644 --- a/drivers/staging/iio/adc/max1363_core.c +++ b/drivers/staging/iio/adc/max1363_core.c | |||
@@ -255,7 +255,7 @@ static ssize_t max1363_read_single_channel(struct device *dev, | |||
255 | goto error_ret; | 255 | goto error_ret; |
256 | } | 256 | } |
257 | 257 | ||
258 | /* If ring buffer capture is occuring, query the buffer */ | 258 | /* If ring buffer capture is occurring, query the buffer */ |
259 | if (iio_ring_enabled(dev_info)) { | 259 | if (iio_ring_enabled(dev_info)) { |
260 | mask = max1363_mode_table[this_attr->address].modemask; | 260 | mask = max1363_mode_table[this_attr->address].modemask; |
261 | data = max1363_single_channel_from_ring(mask, st); | 261 | data = max1363_single_channel_from_ring(mask, st); |
@@ -1425,7 +1425,7 @@ error_ret: | |||
1425 | } | 1425 | } |
1426 | 1426 | ||
1427 | /* | 1427 | /* |
1428 | * To keep this managable we always use one of 3 scan modes. | 1428 | * To keep this manageable we always use one of 3 scan modes. |
1429 | * Scan 0...3, 0-1,2-3 and 1-0,3-2 | 1429 | * Scan 0...3, 0-1,2-3 and 1-0,3-2 |
1430 | */ | 1430 | */ |
1431 | static inline int __max1363_check_event_mask(int thismask, int checkmask) | 1431 | static inline int __max1363_check_event_mask(int thismask, int checkmask) |
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c index 5532f3e466bc..d36fcc62e976 100644 --- a/drivers/staging/iio/adc/max1363_ring.c +++ b/drivers/staging/iio/adc/max1363_ring.c | |||
@@ -108,7 +108,7 @@ static int max1363_ring_preenable(struct iio_dev *indio_dev) | |||
108 | /** | 108 | /** |
109 | * max1363_poll_func_th() - th of trigger launched polling to ring buffer | 109 | * max1363_poll_func_th() - th of trigger launched polling to ring buffer |
110 | * | 110 | * |
111 | * As sampling only occurs on i2c comms occuring, leave timestamping until | 111 | * As sampling only occurs on i2c comms occurring, leave timestamping until |
112 | * then. Some triggers will generate their own time stamp. Currently | 112 | * then. Some triggers will generate their own time stamp. Currently |
113 | * there is no way of notifying them when no one cares. | 113 | * there is no way of notifying them when no one cares. |
114 | **/ | 114 | **/ |
diff --git a/drivers/staging/iio/chrdev.h b/drivers/staging/iio/chrdev.h index 98d1a2c12df2..4fcb99c816f9 100644 --- a/drivers/staging/iio/chrdev.h +++ b/drivers/staging/iio/chrdev.h | |||
@@ -33,7 +33,7 @@ struct iio_handler { | |||
33 | /** | 33 | /** |
34 | * struct iio_event_data - The actual event being pushed to userspace | 34 | * struct iio_event_data - The actual event being pushed to userspace |
35 | * @id: event identifier | 35 | * @id: event identifier |
36 | * @timestamp: best estimate of time of event occurance (often from | 36 | * @timestamp: best estimate of time of event occurrence (often from |
37 | * the interrupt handler) | 37 | * the interrupt handler) |
38 | */ | 38 | */ |
39 | struct iio_event_data { | 39 | struct iio_event_data { |
@@ -42,7 +42,7 @@ struct iio_event_data { | |||
42 | }; | 42 | }; |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * struct iio_detected_event_list - list element for events that have occured | 45 | * struct iio_detected_event_list - list element for events that have occurred |
46 | * @list: linked list header | 46 | * @list: linked list header |
47 | * @ev: the event itself | 47 | * @ev: the event itself |
48 | * @shared_pointer: used when the event is shared - i.e. can be escallated | 48 | * @shared_pointer: used when the event is shared - i.e. can be escallated |
@@ -98,7 +98,7 @@ struct iio_event_interface { | |||
98 | * @list: list header | 98 | * @list: list header |
99 | * @refcount: as the handler may be shared between multiple device | 99 | * @refcount: as the handler may be shared between multiple device |
100 | * side events, reference counting ensures clean removal | 100 | * side events, reference counting ensures clean removal |
101 | * @exist_lock: prevents race conditions related to refcount useage. | 101 | * @exist_lock: prevents race conditions related to refcount usage. |
102 | * @handler: event handler function - called on event if this | 102 | * @handler: event handler function - called on event if this |
103 | * event_handler is enabled. | 103 | * event_handler is enabled. |
104 | * | 104 | * |
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c index 700eb3980f9e..ae53e71d1c2f 100644 --- a/drivers/staging/iio/gyro/adis16060_core.c +++ b/drivers/staging/iio/gyro/adis16060_core.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * @us_w: actual spi_device to write config | 30 | * @us_w: actual spi_device to write config |
31 | * @us_r: actual spi_device to read back data | 31 | * @us_r: actual spi_device to read back data |
32 | * @indio_dev: industrial I/O device structure | 32 | * @indio_dev: industrial I/O device structure |
33 | * @buf: transmit or recieve buffer | 33 | * @buf: transmit or receive buffer |
34 | * @buf_lock: mutex to protect tx and rx | 34 | * @buf_lock: mutex to protect tx and rx |
35 | **/ | 35 | **/ |
36 | struct adis16060_state { | 36 | struct adis16060_state { |
diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/staging/iio/gyro/adis16080_core.c index fb4336c7d2a6..ef9e304a226d 100644 --- a/drivers/staging/iio/gyro/adis16080_core.c +++ b/drivers/staging/iio/gyro/adis16080_core.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * struct adis16080_state - device instance specific data | 35 | * struct adis16080_state - device instance specific data |
36 | * @us: actual spi_device to write data | 36 | * @us: actual spi_device to write data |
37 | * @indio_dev: industrial I/O device structure | 37 | * @indio_dev: industrial I/O device structure |
38 | * @buf: transmit or recieve buffer | 38 | * @buf: transmit or receive buffer |
39 | * @buf_lock: mutex to protect tx and rx | 39 | * @buf_lock: mutex to protect tx and rx |
40 | **/ | 40 | **/ |
41 | struct adis16080_state { | 41 | struct adis16080_state { |
diff --git a/drivers/staging/iio/gyro/adis16260.h b/drivers/staging/iio/gyro/adis16260.h index c1fd4364287f..1369501b4096 100644 --- a/drivers/staging/iio/gyro/adis16260.h +++ b/drivers/staging/iio/gyro/adis16260.h | |||
@@ -91,7 +91,7 @@ | |||
91 | * @indio_dev: industrial I/O device structure | 91 | * @indio_dev: industrial I/O device structure |
92 | * @trig: data ready trigger registered with iio | 92 | * @trig: data ready trigger registered with iio |
93 | * @tx: transmit buffer | 93 | * @tx: transmit buffer |
94 | * @rx: recieve buffer | 94 | * @rx: receive buffer |
95 | * @buf_lock: mutex to protect tx and rx | 95 | * @buf_lock: mutex to protect tx and rx |
96 | * @negate: negate the scale parameter | 96 | * @negate: negate the scale parameter |
97 | **/ | 97 | **/ |
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h index 248bdd2846fd..7127f26f8d26 100644 --- a/drivers/staging/iio/iio.h +++ b/drivers/staging/iio/iio.h | |||
@@ -92,7 +92,7 @@ void iio_remove_event_from_list(struct iio_event_handler_list *el, | |||
92 | * changes | 92 | * changes |
93 | * @available_scan_masks: [DRIVER] optional array of allowed bitmasks | 93 | * @available_scan_masks: [DRIVER] optional array of allowed bitmasks |
94 | * @trig: [INTERN] current device trigger (ring buffer modes) | 94 | * @trig: [INTERN] current device trigger (ring buffer modes) |
95 | * @pollfunc: [DRIVER] function run on trigger being recieved | 95 | * @pollfunc: [DRIVER] function run on trigger being received |
96 | **/ | 96 | **/ |
97 | struct iio_dev { | 97 | struct iio_dev { |
98 | int id; | 98 | int id; |
diff --git a/drivers/staging/iio/imu/adis16300.h b/drivers/staging/iio/imu/adis16300.h index 1f25d68064a0..c0957591aed7 100644 --- a/drivers/staging/iio/imu/adis16300.h +++ b/drivers/staging/iio/imu/adis16300.h | |||
@@ -99,7 +99,7 @@ | |||
99 | * @indio_dev: industrial I/O device structure | 99 | * @indio_dev: industrial I/O device structure |
100 | * @trig: data ready trigger registered with iio | 100 | * @trig: data ready trigger registered with iio |
101 | * @tx: transmit buffer | 101 | * @tx: transmit buffer |
102 | * @rx: recieve buffer | 102 | * @rx: receive buffer |
103 | * @buf_lock: mutex to protect tx and rx | 103 | * @buf_lock: mutex to protect tx and rx |
104 | **/ | 104 | **/ |
105 | struct adis16300_state { | 105 | struct adis16300_state { |
diff --git a/drivers/staging/iio/imu/adis16350.h b/drivers/staging/iio/imu/adis16350.h index b00001e3edd0..b1ad48662a2c 100644 --- a/drivers/staging/iio/imu/adis16350.h +++ b/drivers/staging/iio/imu/adis16350.h | |||
@@ -105,7 +105,7 @@ | |||
105 | * @indio_dev: industrial I/O device structure | 105 | * @indio_dev: industrial I/O device structure |
106 | * @trig: data ready trigger registered with iio | 106 | * @trig: data ready trigger registered with iio |
107 | * @tx: transmit buffer | 107 | * @tx: transmit buffer |
108 | * @rx: recieve buffer | 108 | * @rx: receive buffer |
109 | * @buf_lock: mutex to protect tx and rx | 109 | * @buf_lock: mutex to protect tx and rx |
110 | **/ | 110 | **/ |
111 | struct adis16350_state { | 111 | struct adis16350_state { |
diff --git a/drivers/staging/iio/imu/adis16400.h b/drivers/staging/iio/imu/adis16400.h index 6ff33e1ad8c1..7a127029e099 100644 --- a/drivers/staging/iio/imu/adis16400.h +++ b/drivers/staging/iio/imu/adis16400.h | |||
@@ -131,7 +131,7 @@ | |||
131 | * @indio_dev: industrial I/O device structure | 131 | * @indio_dev: industrial I/O device structure |
132 | * @trig: data ready trigger registered with iio | 132 | * @trig: data ready trigger registered with iio |
133 | * @tx: transmit buffer | 133 | * @tx: transmit buffer |
134 | * @rx: recieve buffer | 134 | * @rx: receive buffer |
135 | * @buf_lock: mutex to protect tx and rx | 135 | * @buf_lock: mutex to protect tx and rx |
136 | **/ | 136 | **/ |
137 | struct adis16400_state { | 137 | struct adis16400_state { |
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index f3bf111f354f..1795ee1e8207 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c | |||
@@ -258,7 +258,7 @@ static ssize_t iio_event_chrdev_read(struct file *filep, | |||
258 | ->det_events.list)); | 258 | ->det_events.list)); |
259 | if (ret) | 259 | if (ret) |
260 | goto error_ret; | 260 | goto error_ret; |
261 | /* Single access device so noone else can get the data */ | 261 | /* Single access device so no one else can get the data */ |
262 | mutex_lock(&ev_int->event_list_lock); | 262 | mutex_lock(&ev_int->event_list_lock); |
263 | } | 263 | } |
264 | 264 | ||
diff --git a/drivers/staging/iio/meter/ade7753.h b/drivers/staging/iio/meter/ade7753.h index 70dabae6efe9..3b9c7f6a50e7 100644 --- a/drivers/staging/iio/meter/ade7753.h +++ b/drivers/staging/iio/meter/ade7753.h | |||
@@ -62,7 +62,7 @@ | |||
62 | * @us: actual spi_device | 62 | * @us: actual spi_device |
63 | * @indio_dev: industrial I/O device structure | 63 | * @indio_dev: industrial I/O device structure |
64 | * @tx: transmit buffer | 64 | * @tx: transmit buffer |
65 | * @rx: recieve buffer | 65 | * @rx: receive buffer |
66 | * @buf_lock: mutex to protect tx and rx | 66 | * @buf_lock: mutex to protect tx and rx |
67 | **/ | 67 | **/ |
68 | struct ade7753_state { | 68 | struct ade7753_state { |
diff --git a/drivers/staging/iio/meter/ade7754.h b/drivers/staging/iio/meter/ade7754.h index 8faa9b3b48b6..0aa0522a33a3 100644 --- a/drivers/staging/iio/meter/ade7754.h +++ b/drivers/staging/iio/meter/ade7754.h | |||
@@ -80,7 +80,7 @@ | |||
80 | * @us: actual spi_device | 80 | * @us: actual spi_device |
81 | * @indio_dev: industrial I/O device structure | 81 | * @indio_dev: industrial I/O device structure |
82 | * @tx: transmit buffer | 82 | * @tx: transmit buffer |
83 | * @rx: recieve buffer | 83 | * @rx: receive buffer |
84 | * @buf_lock: mutex to protect tx and rx | 84 | * @buf_lock: mutex to protect tx and rx |
85 | **/ | 85 | **/ |
86 | struct ade7754_state { | 86 | struct ade7754_state { |
diff --git a/drivers/staging/iio/meter/ade7758.h b/drivers/staging/iio/meter/ade7758.h index df5bb7ba5a0f..c6fd94f3b3ee 100644 --- a/drivers/staging/iio/meter/ade7758.h +++ b/drivers/staging/iio/meter/ade7758.h | |||
@@ -98,7 +98,7 @@ | |||
98 | * @indio_dev: industrial I/O device structure | 98 | * @indio_dev: industrial I/O device structure |
99 | * @trig: data ready trigger registered with iio | 99 | * @trig: data ready trigger registered with iio |
100 | * @tx: transmit buffer | 100 | * @tx: transmit buffer |
101 | * @rx: recieve buffer | 101 | * @rx: receive buffer |
102 | * @buf_lock: mutex to protect tx and rx | 102 | * @buf_lock: mutex to protect tx and rx |
103 | **/ | 103 | **/ |
104 | struct ade7758_state { | 104 | struct ade7758_state { |
diff --git a/drivers/staging/iio/meter/ade7759.h b/drivers/staging/iio/meter/ade7759.h index e9d1c43336fe..cc76c2c4c039 100644 --- a/drivers/staging/iio/meter/ade7759.h +++ b/drivers/staging/iio/meter/ade7759.h | |||
@@ -43,7 +43,7 @@ | |||
43 | * @us: actual spi_device | 43 | * @us: actual spi_device |
44 | * @indio_dev: industrial I/O device structure | 44 | * @indio_dev: industrial I/O device structure |
45 | * @tx: transmit buffer | 45 | * @tx: transmit buffer |
46 | * @rx: recieve buffer | 46 | * @rx: receive buffer |
47 | * @buf_lock: mutex to protect tx and rx | 47 | * @buf_lock: mutex to protect tx and rx |
48 | **/ | 48 | **/ |
49 | struct ade7759_state { | 49 | struct ade7759_state { |
diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h index 4ad84a3bb462..79a21109f4e2 100644 --- a/drivers/staging/iio/meter/ade7854.h +++ b/drivers/staging/iio/meter/ade7854.h | |||
@@ -149,7 +149,7 @@ | |||
149 | * @spi: actual spi_device | 149 | * @spi: actual spi_device |
150 | * @indio_dev: industrial I/O device structure | 150 | * @indio_dev: industrial I/O device structure |
151 | * @tx: transmit buffer | 151 | * @tx: transmit buffer |
152 | * @rx: recieve buffer | 152 | * @rx: receive buffer |
153 | * @buf_lock: mutex to protect tx and rx | 153 | * @buf_lock: mutex to protect tx and rx |
154 | **/ | 154 | **/ |
155 | struct ade7854_state { | 155 | struct ade7854_state { |
diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index f21ac09373cf..32948e55dc81 100644 --- a/drivers/staging/iio/ring_generic.h +++ b/drivers/staging/iio/ring_generic.h | |||
@@ -30,7 +30,7 @@ int iio_push_ring_event(struct iio_ring_buffer *ring_buf, | |||
30 | * @event_code: event indentification code | 30 | * @event_code: event indentification code |
31 | * @timestamp: time of event | 31 | * @timestamp: time of event |
32 | * | 32 | * |
33 | * Typical usecase is to escalate a 50% ring full to 75% full if noone has yet | 33 | * Typical usecase is to escalate a 50% ring full to 75% full if no one has yet |
34 | * read the first event. Clearly the 50% full is no longer of interest in | 34 | * read the first event. Clearly the 50% full is no longer of interest in |
35 | * typical use case. | 35 | * typical use case. |
36 | **/ | 36 | **/ |
diff --git a/drivers/staging/intel_sst/TODO b/drivers/staging/intel_sst/TODO index a24e5ed5689c..c733d7011091 100644 --- a/drivers/staging/intel_sst/TODO +++ b/drivers/staging/intel_sst/TODO | |||
@@ -1,7 +1,7 @@ | |||
1 | TODO | 1 | TODO |
2 | ---- | 2 | ---- |
3 | 3 | ||
4 | Get the memrar driver cleaned up and upstream (dependancy blocking SST) | 4 | Get the memrar driver cleaned up and upstream (dependency blocking SST) |
5 | Replace long/short press with two virtual buttons | 5 | Replace long/short press with two virtual buttons |
6 | Review the printks and kill off any left over ST_ERR: messages | 6 | Review the printks and kill off any left over ST_ERR: messages |
7 | Review the misc device ioctls for 32/64bit safety and sanity | 7 | Review the misc device ioctls for 32/64bit safety and sanity |
diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c index ce4a9f79ccd2..81c24d19eb9e 100644 --- a/drivers/staging/intel_sst/intel_sst.c +++ b/drivers/staging/intel_sst/intel_sst.c | |||
@@ -263,7 +263,7 @@ static int __devinit intel_sst_probe(struct pci_dev *pci, | |||
263 | /* Init the device */ | 263 | /* Init the device */ |
264 | ret = pci_enable_device(pci); | 264 | ret = pci_enable_device(pci); |
265 | if (ret) { | 265 | if (ret) { |
266 | pr_err("device cant be enabled\n"); | 266 | pr_err("device can't be enabled\n"); |
267 | goto do_free_mem; | 267 | goto do_free_mem; |
268 | } | 268 | } |
269 | sst_drv_ctx->pci = pci_dev_get(pci); | 269 | sst_drv_ctx->pci = pci_dev_get(pci); |
@@ -453,7 +453,7 @@ int intel_sst_resume(struct pci_dev *pci) | |||
453 | pci_restore_state(pci); | 453 | pci_restore_state(pci); |
454 | ret = pci_enable_device(pci); | 454 | ret = pci_enable_device(pci); |
455 | if (ret) | 455 | if (ret) |
456 | pr_err("device cant be enabled\n"); | 456 | pr_err("device can't be enabled\n"); |
457 | 457 | ||
458 | mutex_lock(&sst_drv_ctx->sst_lock); | 458 | mutex_lock(&sst_drv_ctx->sst_lock); |
459 | sst_drv_ctx->sst_state = SST_UN_INIT; | 459 | sst_drv_ctx->sst_state = SST_UN_INIT; |
diff --git a/drivers/staging/intel_sst/intel_sst_app_interface.c b/drivers/staging/intel_sst/intel_sst_app_interface.c index a367991d5600..1d0621260ea8 100644 --- a/drivers/staging/intel_sst/intel_sst_app_interface.c +++ b/drivers/staging/intel_sst/intel_sst_app_interface.c | |||
@@ -236,7 +236,7 @@ int intel_sst_mmap(struct file *file_ptr, struct vm_area_struct *vma) | |||
236 | if (!sst_drv_ctx->mmap_mem) | 236 | if (!sst_drv_ctx->mmap_mem) |
237 | return -EIO; | 237 | return -EIO; |
238 | 238 | ||
239 | /* round it up to the page bondary */ | 239 | /* round it up to the page boundary */ |
240 | /*mem_area = (void *)((((unsigned long)sst_drv_ctx->mmap_mem) | 240 | /*mem_area = (void *)((((unsigned long)sst_drv_ctx->mmap_mem) |
241 | + PAGE_SIZE - 1) & PAGE_MASK);*/ | 241 | + PAGE_SIZE - 1) & PAGE_MASK);*/ |
242 | mem_area = (void *) PAGE_ALIGN((unsigned int) sst_drv_ctx->mmap_mem); | 242 | mem_area = (void *) PAGE_ALIGN((unsigned int) sst_drv_ctx->mmap_mem); |
@@ -871,7 +871,7 @@ int sst_send_algo_ipc(struct ipc_post **msg) | |||
871 | } | 871 | } |
872 | 872 | ||
873 | /** | 873 | /** |
874 | * intel_sst_ioctl_dsp - recieves the device ioctl's | 874 | * intel_sst_ioctl_dsp - receives the device ioctl's |
875 | * | 875 | * |
876 | * @cmd:Ioctl cmd | 876 | * @cmd:Ioctl cmd |
877 | * @arg:data | 877 | * @arg:data |
@@ -1067,7 +1067,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) | |||
1067 | retval = -EFAULT; | 1067 | retval = -EFAULT; |
1068 | break; | 1068 | break; |
1069 | } | 1069 | } |
1070 | pr_debug("SET_VOLUME recieved for %d!\n", | 1070 | pr_debug("SET_VOLUME received for %d!\n", |
1071 | set_vol.stream_id); | 1071 | set_vol.stream_id); |
1072 | if (minor == STREAM_MODULE && set_vol.stream_id == 0) { | 1072 | if (minor == STREAM_MODULE && set_vol.stream_id == 0) { |
1073 | pr_debug("invalid operation!\n"); | 1073 | pr_debug("invalid operation!\n"); |
@@ -1085,7 +1085,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) | |||
1085 | retval = -EFAULT; | 1085 | retval = -EFAULT; |
1086 | break; | 1086 | break; |
1087 | } | 1087 | } |
1088 | pr_debug("IOCTL_GET_VOLUME recieved for stream = %d!\n", | 1088 | pr_debug("IOCTL_GET_VOLUME received for stream = %d!\n", |
1089 | get_vol.stream_id); | 1089 | get_vol.stream_id); |
1090 | if (minor == STREAM_MODULE && get_vol.stream_id == 0) { | 1090 | if (minor == STREAM_MODULE && get_vol.stream_id == 0) { |
1091 | pr_debug("invalid operation!\n"); | 1091 | pr_debug("invalid operation!\n"); |
@@ -1117,7 +1117,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) | |||
1117 | retval = -EFAULT; | 1117 | retval = -EFAULT; |
1118 | break; | 1118 | break; |
1119 | } | 1119 | } |
1120 | pr_debug("SNDRV_SST_SET_VOLUME recieved for %d!\n", | 1120 | pr_debug("SNDRV_SST_SET_VOLUME received for %d!\n", |
1121 | set_mute.stream_id); | 1121 | set_mute.stream_id); |
1122 | if (minor == STREAM_MODULE && set_mute.stream_id == 0) { | 1122 | if (minor == STREAM_MODULE && set_mute.stream_id == 0) { |
1123 | retval = -EPERM; | 1123 | retval = -EPERM; |
@@ -1153,7 +1153,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) | |||
1153 | case _IOC_NR(SNDRV_SST_MMAP_CAPTURE): { | 1153 | case _IOC_NR(SNDRV_SST_MMAP_CAPTURE): { |
1154 | struct snd_sst_mmap_buffs mmap_buf; | 1154 | struct snd_sst_mmap_buffs mmap_buf; |
1155 | 1155 | ||
1156 | pr_debug("SNDRV_SST_MMAP_PLAY/CAPTURE recieved!\n"); | 1156 | pr_debug("SNDRV_SST_MMAP_PLAY/CAPTURE received!\n"); |
1157 | if (minor != STREAM_MODULE) { | 1157 | if (minor != STREAM_MODULE) { |
1158 | retval = -EBADRQC; | 1158 | retval = -EBADRQC; |
1159 | break; | 1159 | break; |
@@ -1239,7 +1239,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) | |||
1239 | case _IOC_NR(SNDRV_SST_SET_TARGET_DEVICE): { | 1239 | case _IOC_NR(SNDRV_SST_SET_TARGET_DEVICE): { |
1240 | struct snd_sst_target_device target_device; | 1240 | struct snd_sst_target_device target_device; |
1241 | 1241 | ||
1242 | pr_debug("SET_TARGET_DEVICE recieved!\n"); | 1242 | pr_debug("SET_TARGET_DEVICE received!\n"); |
1243 | if (copy_from_user(&target_device, (void __user *)arg, | 1243 | if (copy_from_user(&target_device, (void __user *)arg, |
1244 | sizeof(target_device))) { | 1244 | sizeof(target_device))) { |
1245 | retval = -EFAULT; | 1245 | retval = -EFAULT; |
@@ -1256,7 +1256,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) | |||
1256 | case _IOC_NR(SNDRV_SST_DRIVER_INFO): { | 1256 | case _IOC_NR(SNDRV_SST_DRIVER_INFO): { |
1257 | struct snd_sst_driver_info info; | 1257 | struct snd_sst_driver_info info; |
1258 | 1258 | ||
1259 | pr_debug("SNDRV_SST_DRIVER_INFO recived\n"); | 1259 | pr_debug("SNDRV_SST_DRIVER_INFO received\n"); |
1260 | info.version = SST_VERSION_NUM; | 1260 | info.version = SST_VERSION_NUM; |
1261 | /* hard coding, shud get sumhow later */ | 1261 | /* hard coding, shud get sumhow later */ |
1262 | info.active_pcm_streams = sst_drv_ctx->stream_cnt - | 1262 | info.active_pcm_streams = sst_drv_ctx->stream_cnt - |
diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/drivers/staging/intel_sst/intel_sst_drv_interface.c index ea8e251b5099..e9c182108243 100644 --- a/drivers/staging/intel_sst/intel_sst_drv_interface.c +++ b/drivers/staging/intel_sst/intel_sst_drv_interface.c | |||
@@ -315,7 +315,7 @@ int sst_open_pcm_stream(struct snd_sst_params *str_param) | |||
315 | pm_runtime_get_sync(&sst_drv_ctx->pci->dev); | 315 | pm_runtime_get_sync(&sst_drv_ctx->pci->dev); |
316 | 316 | ||
317 | if (sst_drv_ctx->sst_state == SST_SUSPENDED) { | 317 | if (sst_drv_ctx->sst_state == SST_SUSPENDED) { |
318 | /* LPE is suspended, resume it before proceding*/ | 318 | /* LPE is suspended, resume it before proceeding*/ |
319 | pr_debug("Resuming from Suspended state\n"); | 319 | pr_debug("Resuming from Suspended state\n"); |
320 | retval = intel_sst_resume(sst_drv_ctx->pci); | 320 | retval = intel_sst_resume(sst_drv_ctx->pci); |
321 | if (retval) { | 321 | if (retval) { |
diff --git a/drivers/staging/intel_sst/intel_sst_dsp.c b/drivers/staging/intel_sst/intel_sst_dsp.c index 6e5c9152da9f..bffe4c6e2928 100644 --- a/drivers/staging/intel_sst/intel_sst_dsp.c +++ b/drivers/staging/intel_sst/intel_sst_dsp.c | |||
@@ -350,7 +350,7 @@ static int sst_download_library(const struct firmware *fw_lib, | |||
350 | 350 | ||
351 | } | 351 | } |
352 | 352 | ||
353 | /* This function is called befoer downloading the codec/postprocessing | 353 | /* This function is called before downloading the codec/postprocessing |
354 | library is set for download to SST DSP*/ | 354 | library is set for download to SST DSP*/ |
355 | static int sst_validate_library(const struct firmware *fw_lib, | 355 | static int sst_validate_library(const struct firmware *fw_lib, |
356 | struct lib_slot_info *slot, | 356 | struct lib_slot_info *slot, |
@@ -405,7 +405,7 @@ exit: | |||
405 | 405 | ||
406 | } | 406 | } |
407 | 407 | ||
408 | /* This function is called when FW requests for a particular libary download | 408 | /* This function is called when FW requests for a particular library download |
409 | This function prepares the library to download*/ | 409 | This function prepares the library to download*/ |
410 | int sst_load_library(struct snd_sst_lib_download *lib, u8 ops) | 410 | int sst_load_library(struct snd_sst_lib_download *lib, u8 ops) |
411 | { | 411 | { |
diff --git a/drivers/staging/intel_sst/intel_sst_fw_ipc.h b/drivers/staging/intel_sst/intel_sst_fw_ipc.h index 8df313d10d2a..0f0c5bbc5f4b 100644 --- a/drivers/staging/intel_sst/intel_sst_fw_ipc.h +++ b/drivers/staging/intel_sst/intel_sst_fw_ipc.h | |||
@@ -111,7 +111,7 @@ | |||
111 | #define IPC_SST_PERIOD_ELAPSED 0x97 /* period elapsed */ | 111 | #define IPC_SST_PERIOD_ELAPSED 0x97 /* period elapsed */ |
112 | #define IPC_IA_TARGET_DEV_CHNGD 0x98 /* error in processing a stream */ | 112 | #define IPC_IA_TARGET_DEV_CHNGD 0x98 /* error in processing a stream */ |
113 | 113 | ||
114 | #define IPC_SST_ERROR_EVENT 0x99 /* Buffer over run occured */ | 114 | #define IPC_SST_ERROR_EVENT 0x99 /* Buffer over run occurred */ |
115 | /* L2S messages */ | 115 | /* L2S messages */ |
116 | #define IPC_SC_DDR_LINK_UP 0xC0 | 116 | #define IPC_SC_DDR_LINK_UP 0xC0 |
117 | #define IPC_SC_DDR_LINK_DOWN 0xC1 | 117 | #define IPC_SC_DDR_LINK_DOWN 0xC1 |
diff --git a/drivers/staging/intel_sst/intel_sst_stream.c b/drivers/staging/intel_sst/intel_sst_stream.c index 795e42ab7360..dd58be5b1975 100644 --- a/drivers/staging/intel_sst/intel_sst_stream.c +++ b/drivers/staging/intel_sst/intel_sst_stream.c | |||
@@ -98,7 +98,7 @@ static unsigned int get_mrst_stream_id(void) | |||
98 | if (sst_drv_ctx->streams[i].status == STREAM_UN_INIT) | 98 | if (sst_drv_ctx->streams[i].status == STREAM_UN_INIT) |
99 | return i; | 99 | return i; |
100 | } | 100 | } |
101 | pr_debug("Didnt find empty stream for mrst\n"); | 101 | pr_debug("Didn't find empty stream for mrst\n"); |
102 | return -EBUSY; | 102 | return -EBUSY; |
103 | } | 103 | } |
104 | 104 | ||
diff --git a/drivers/staging/intel_sst/intel_sst_stream_encoded.c b/drivers/staging/intel_sst/intel_sst_stream_encoded.c index 29753c7519a7..d5f07b878828 100644 --- a/drivers/staging/intel_sst/intel_sst_stream_encoded.c +++ b/drivers/staging/intel_sst/intel_sst_stream_encoded.c | |||
@@ -914,7 +914,7 @@ static int sst_prepare_input_buffers_rar(struct stream_info *str_info, | |||
914 | (void *) ((unsigned long) rar_buffers.bus_address); | 914 | (void *) ((unsigned long) rar_buffers.bus_address); |
915 | pr_debug("RAR buf addr in DnR (input buffer function)0x%lu", | 915 | pr_debug("RAR buf addr in DnR (input buffer function)0x%lu", |
916 | (unsigned long) str_info->decode_ibuf); | 916 | (unsigned long) str_info->decode_ibuf); |
917 | pr_debug("rar in DnR decode funtion/output b_add rar =0x%lu", | 917 | pr_debug("rar in DnR decode function/output b_add rar =0x%lu", |
918 | (unsigned long) rar_buffers.bus_address); | 918 | (unsigned long) rar_buffers.bus_address); |
919 | *input_index = i + 1; | 919 | *input_index = i + 1; |
920 | str_info->decode_isize = dbufs->ibufs->buff_entry[i].size; | 920 | str_info->decode_isize = dbufs->ibufs->buff_entry[i].size; |
diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c index fb2292186703..d207636a7b6d 100644 --- a/drivers/staging/intel_sst/intelmid.c +++ b/drivers/staging/intel_sst/intelmid.c | |||
@@ -773,7 +773,7 @@ static int __devinit snd_intelmad_sst_register( | |||
773 | if (ret_val) | 773 | if (ret_val) |
774 | return ret_val; | 774 | return ret_val; |
775 | sst_card_vendor_id = (vendor_addr.value & (MASK2|MASK1|MASK0)); | 775 | sst_card_vendor_id = (vendor_addr.value & (MASK2|MASK1|MASK0)); |
776 | pr_debug("orginal n extrated vendor id = 0x%x %d\n", | 776 | pr_debug("original n extrated vendor id = 0x%x %d\n", |
777 | vendor_addr.value, sst_card_vendor_id); | 777 | vendor_addr.value, sst_card_vendor_id); |
778 | if (sst_card_vendor_id < 0 || sst_card_vendor_id > 2) { | 778 | if (sst_card_vendor_id < 0 || sst_card_vendor_id > 2) { |
779 | pr_err("vendor card not supported!!\n"); | 779 | pr_err("vendor card not supported!!\n"); |
diff --git a/drivers/staging/intel_sst/intelmid.h b/drivers/staging/intel_sst/intelmid.h index ca881b790cb2..e77da87e1df0 100644 --- a/drivers/staging/intel_sst/intelmid.h +++ b/drivers/staging/intel_sst/intelmid.h | |||
@@ -90,7 +90,7 @@ struct mad_jack_msg_wq { | |||
90 | * @card_index: sound card index | 90 | * @card_index: sound card index |
91 | * @card_id: sound card id detected | 91 | * @card_id: sound card id detected |
92 | * @sstdrv_ops: ptr to sst driver ops | 92 | * @sstdrv_ops: ptr to sst driver ops |
93 | * @pdev: ptr to platfrom device | 93 | * @pdev: ptr to platform device |
94 | * @irq: interrupt number detected | 94 | * @irq: interrupt number detected |
95 | * @pmic_status: Device status of sound card | 95 | * @pmic_status: Device status of sound card |
96 | * @int_base: ptr to MMIO interrupt region | 96 | * @int_base: ptr to MMIO interrupt region |
diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c index 5c01f28f0734..8af7c84daee2 100644 --- a/drivers/staging/keucr/init.c +++ b/drivers/staging/keucr/init.c | |||
@@ -90,7 +90,7 @@ int ENE_MSInit(struct us_data *us) | |||
90 | 90 | ||
91 | result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0); | 91 | result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0); |
92 | if (result != USB_STOR_XFER_GOOD) { | 92 | if (result != USB_STOR_XFER_GOOD) { |
93 | printk(KERN_ERR "Exection MS Init Code Fail !!\n"); | 93 | printk(KERN_ERR "Execution MS Init Code Fail !!\n"); |
94 | return USB_STOR_TRANSPORT_ERROR; | 94 | return USB_STOR_TRANSPORT_ERROR; |
95 | } | 95 | } |
96 | 96 | ||
@@ -145,7 +145,7 @@ int ENE_SMInit(struct us_data *us) | |||
145 | result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0); | 145 | result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0); |
146 | if (result != USB_STOR_XFER_GOOD) { | 146 | if (result != USB_STOR_XFER_GOOD) { |
147 | printk(KERN_ERR | 147 | printk(KERN_ERR |
148 | "Exection SM Init Code Fail !! result = %x\n", result); | 148 | "Execution SM Init Code Fail !! result = %x\n", result); |
149 | return USB_STOR_TRANSPORT_ERROR; | 149 | return USB_STOR_TRANSPORT_ERROR; |
150 | } | 150 | } |
151 | 151 | ||
diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c index 2cbe9f897eef..95c688a5c95a 100644 --- a/drivers/staging/keucr/smilmain.c +++ b/drivers/staging/keucr/smilmain.c | |||
@@ -64,7 +64,7 @@ extern struct SSFDCTYPE Ssfdc; | |||
64 | extern struct ADDRESS Media; | 64 | extern struct ADDRESS Media; |
65 | extern struct CIS_AREA CisArea; | 65 | extern struct CIS_AREA CisArea; |
66 | 66 | ||
67 | //BIT Controll Macro | 67 | //BIT Control Macro |
68 | BYTE BitData[] = { 0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80 } ; | 68 | BYTE BitData[] = { 0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80 } ; |
69 | #define Set_D_Bit(a,b) (a[(BYTE)((b)/8)]|= BitData[(b)%8]) | 69 | #define Set_D_Bit(a,b) (a[(BYTE)((b)/8)]|= BitData[(b)%8]) |
70 | #define Clr_D_Bit(a,b) (a[(BYTE)((b)/8)]&=~BitData[(b)%8]) | 70 | #define Clr_D_Bit(a,b) (a[(BYTE)((b)/8)]&=~BitData[(b)%8]) |
@@ -76,7 +76,7 @@ extern BYTE IsXDCompliance; | |||
76 | 76 | ||
77 | 77 | ||
78 | // | 78 | // |
79 | ////Power Controll & Media Exist Check Function | 79 | ////Power Control & Media Exist Check Function |
80 | ////----- Init_D_SmartMedia() -------------------------------------------- | 80 | ////----- Init_D_SmartMedia() -------------------------------------------- |
81 | //int Init_D_SmartMedia(void) | 81 | //int Init_D_SmartMedia(void) |
82 | //{ | 82 | //{ |
@@ -575,7 +575,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt) | |||
575 | // return(SUCCESS); | 575 | // return(SUCCESS); |
576 | //} | 576 | //} |
577 | // | 577 | // |
578 | ////Power Controll & Media Exist Check Subroutine | 578 | ////Power Control & Media Exist Check Subroutine |
579 | ////----- Initialize_D_Media() ------------------------------------------- | 579 | ////----- Initialize_D_Media() ------------------------------------------- |
580 | //void Initialize_D_Media(void) | 580 | //void Initialize_D_Media(void) |
581 | //{ | 581 | //{ |
@@ -738,7 +738,7 @@ int Check_D_MediaFmt(struct us_data *us) | |||
738 | // return(SUCCESS); | 738 | // return(SUCCESS); |
739 | //} | 739 | //} |
740 | */ | 740 | */ |
741 | //SmartMedia Physical Address Controll Subroutine | 741 | //SmartMedia Physical Address Control Subroutine |
742 | //----- Conv_D_MediaAddr() --------------------------------------------- | 742 | //----- Conv_D_MediaAddr() --------------------------------------------- |
743 | int Conv_D_MediaAddr(struct us_data *us, DWORD addr) | 743 | int Conv_D_MediaAddr(struct us_data *us, DWORD addr) |
744 | { | 744 | { |
diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c index 80da61c37bff..4fe47422eb79 100644 --- a/drivers/staging/keucr/smilsub.c +++ b/drivers/staging/keucr/smilsub.c | |||
@@ -57,7 +57,7 @@ extern WORD WriteBlock; | |||
57 | #define ODD 1 // Odd Page for 256byte/page | 57 | #define ODD 1 // Odd Page for 256byte/page |
58 | 58 | ||
59 | 59 | ||
60 | //SmartMedia Redundant buffer data Controll Subroutine | 60 | //SmartMedia Redundant buffer data Control Subroutine |
61 | //----- Check_D_DataBlank() -------------------------------------------- | 61 | //----- Check_D_DataBlank() -------------------------------------------- |
62 | int Check_D_DataBlank(BYTE *redundant) | 62 | int Check_D_DataBlank(BYTE *redundant) |
63 | { | 63 | { |
@@ -1367,7 +1367,7 @@ BYTE _Check_D_DevCode(BYTE dcode) | |||
1367 | } | 1367 | } |
1368 | } | 1368 | } |
1369 | /* | 1369 | /* |
1370 | ////SmartMedia Power Controll Subroutine | 1370 | ////SmartMedia Power Control Subroutine |
1371 | ////----- Cnt_D_Reset() ---------------------------------------------- | 1371 | ////----- Cnt_D_Reset() ---------------------------------------------- |
1372 | //void Cnt_D_Reset(void) | 1372 | //void Cnt_D_Reset(void) |
1373 | //{ | 1373 | //{ |
@@ -1478,7 +1478,7 @@ BYTE _Check_D_DevCode(BYTE dcode) | |||
1478 | //} | 1478 | //} |
1479 | // | 1479 | // |
1480 | */ | 1480 | */ |
1481 | //SmartMedia ECC Controll Subroutine | 1481 | //SmartMedia ECC Control Subroutine |
1482 | //----- Check_D_ReadError() ---------------------------------------------- | 1482 | //----- Check_D_ReadError() ---------------------------------------------- |
1483 | int Check_D_ReadError(BYTE *redundant) | 1483 | int Check_D_ReadError(BYTE *redundant) |
1484 | { | 1484 | { |
diff --git a/drivers/staging/lirc/lirc_ene0100.h b/drivers/staging/lirc/lirc_ene0100.h index 776b693bb307..06bebd6acc46 100644 --- a/drivers/staging/lirc/lirc_ene0100.h +++ b/drivers/staging/lirc/lirc_ene0100.h | |||
@@ -81,7 +81,7 @@ | |||
81 | 81 | ||
82 | /* CIR block settings */ | 82 | /* CIR block settings */ |
83 | #define ENE_CIR_CONF1 0xFEC0 | 83 | #define ENE_CIR_CONF1 0xFEC0 |
84 | #define ENE_CIR_CONF1_ADC_ON 0x7 /* reciever on gpio40 enabled */ | 84 | #define ENE_CIR_CONF1_ADC_ON 0x7 /* receiver on gpio40 enabled */ |
85 | #define ENE_CIR_CONF1_LEARN1 (1 << 3) /* enabled on learning mode */ | 85 | #define ENE_CIR_CONF1_LEARN1 (1 << 3) /* enabled on learning mode */ |
86 | #define ENE_CIR_CONF1_TX_ON 0x30 /* enabled on transmit */ | 86 | #define ENE_CIR_CONF1_TX_ON 0x30 /* enabled on transmit */ |
87 | #define ENE_CIR_CONF1_TX_CARR (1 << 7) /* send TX carrier or not */ | 87 | #define ENE_CIR_CONF1_TX_CARR (1 << 7) /* send TX carrier or not */ |
@@ -96,7 +96,7 @@ | |||
96 | 96 | ||
97 | /* transmitter - not implemented yet */ | 97 | /* transmitter - not implemented yet */ |
98 | /* KB3926C and higher */ | 98 | /* KB3926C and higher */ |
99 | /* transmission is very similiar to recieving, a byte is written to */ | 99 | /* transmission is very similar to receiving, a byte is written to */ |
100 | /* ENE_TX_INPUT, in same manner as it is read from sample buffer */ | 100 | /* ENE_TX_INPUT, in same manner as it is read from sample buffer */ |
101 | /* sample period is fixed*/ | 101 | /* sample period is fixed*/ |
102 | 102 | ||
diff --git a/drivers/staging/memrar/memrar_handler.c b/drivers/staging/memrar/memrar_handler.c index cfcaa8e5b8e6..1d9399d6f10f 100644 --- a/drivers/staging/memrar/memrar_handler.c +++ b/drivers/staging/memrar/memrar_handler.c | |||
@@ -690,7 +690,7 @@ static int memrar_mmap(struct file *filp, struct vm_area_struct *vma) | |||
690 | * @inode: inode to open | 690 | * @inode: inode to open |
691 | * @filp: file handle | 691 | * @filp: file handle |
692 | * | 692 | * |
693 | * As we support multiple arbitary opens there is no work to be done | 693 | * As we support multiple arbitrary opens there is no work to be done |
694 | * really. | 694 | * really. |
695 | */ | 695 | */ |
696 | 696 | ||
diff --git a/drivers/staging/msm/mdp4_overlay.c b/drivers/staging/msm/mdp4_overlay.c index de284c28faa1..b9acf5299297 100644 --- a/drivers/staging/msm/mdp4_overlay.c +++ b/drivers/staging/msm/mdp4_overlay.c | |||
@@ -696,7 +696,7 @@ void mdp4_mixer_stage_down(struct mdp4_overlay_pipe *pipe) | |||
696 | stage = pipe->mixer_stage; | 696 | stage = pipe->mixer_stage; |
697 | mixer = pipe->mixer_num; | 697 | mixer = pipe->mixer_num; |
698 | 698 | ||
699 | if (pipe != ctrl->stage[mixer][stage]) /* not runing */ | 699 | if (pipe != ctrl->stage[mixer][stage]) /* not running */ |
700 | return; | 700 | return; |
701 | 701 | ||
702 | /* MDP_LAYERMIXER_IN_CFG, shard by both mixer 0 and 1 */ | 702 | /* MDP_LAYERMIXER_IN_CFG, shard by both mixer 0 and 1 */ |
diff --git a/drivers/staging/msm/mdp_ppp_dq.c b/drivers/staging/msm/mdp_ppp_dq.c index 3dc1c0cc61f9..3a687c7a5695 100644 --- a/drivers/staging/msm/mdp_ppp_dq.c +++ b/drivers/staging/msm/mdp_ppp_dq.c | |||
@@ -200,7 +200,7 @@ static void mdp_ppp_flush_dirty_djobs(void *cond) | |||
200 | msm_fb_ensure_mem_coherency_after_dma(job->info, &job->req, 1); | 200 | msm_fb_ensure_mem_coherency_after_dma(job->info, &job->req, 1); |
201 | 201 | ||
202 | /* Schedule jobs for cleanup | 202 | /* Schedule jobs for cleanup |
203 | * A seperate worker thread does this */ | 203 | * A separate worker thread does this */ |
204 | queue_delayed_work(mdp_ppp_djob_clnr, &job->cleaner, | 204 | queue_delayed_work(mdp_ppp_djob_clnr, &job->cleaner, |
205 | mdp_timer_duration); | 205 | mdp_timer_duration); |
206 | } | 206 | } |
diff --git a/drivers/staging/msm/msm_fb.c b/drivers/staging/msm/msm_fb.c index a2f29d464051..e7ef836eb8de 100644 --- a/drivers/staging/msm/msm_fb.c +++ b/drivers/staging/msm/msm_fb.c | |||
@@ -859,7 +859,7 @@ static int msm_fb_register(struct msm_fb_data_type *mfd) | |||
859 | break; | 859 | break; |
860 | 860 | ||
861 | default: | 861 | default: |
862 | MSM_FB_ERR("msm_fb_init: fb %d unkown image type!\n", | 862 | MSM_FB_ERR("msm_fb_init: fb %d unknown image type!\n", |
863 | mfd->index); | 863 | mfd->index); |
864 | return ret; | 864 | return ret; |
865 | } | 865 | } |
@@ -1793,9 +1793,9 @@ static int msmfb_async_blit(struct fb_info *info, void __user *p) | |||
1793 | /* | 1793 | /* |
1794 | * NOTE: The userspace issues blit operations in a sequence, the sequence | 1794 | * NOTE: The userspace issues blit operations in a sequence, the sequence |
1795 | * start with a operation marked START and ends in an operation marked | 1795 | * start with a operation marked START and ends in an operation marked |
1796 | * END. It is guranteed by the userspace that all the blit operations | 1796 | * END. It is guaranteed by the userspace that all the blit operations |
1797 | * between START and END are only within the regions of areas designated | 1797 | * between START and END are only within the regions of areas designated |
1798 | * by the START and END operations and that the userspace doesnt modify | 1798 | * by the START and END operations and that the userspace doesn't modify |
1799 | * those areas. Hence it would be enough to perform barrier/cache operations | 1799 | * those areas. Hence it would be enough to perform barrier/cache operations |
1800 | * only on the START and END operations. | 1800 | * only on the START and END operations. |
1801 | */ | 1801 | */ |
diff --git a/drivers/staging/octeon/cvmx-cmd-queue.h b/drivers/staging/octeon/cvmx-cmd-queue.h index 59d221422293..614653b686a0 100644 --- a/drivers/staging/octeon/cvmx-cmd-queue.h +++ b/drivers/staging/octeon/cvmx-cmd-queue.h | |||
@@ -214,7 +214,7 @@ static inline int __cvmx_cmd_queue_get_index(cvmx_cmd_queue_id_t queue_id) | |||
214 | /* | 214 | /* |
215 | * Warning: This code currently only works with devices that | 215 | * Warning: This code currently only works with devices that |
216 | * have 256 queues or less. Devices with more than 16 queues | 216 | * have 256 queues or less. Devices with more than 16 queues |
217 | * are layed out in memory to allow cores quick access to | 217 | * are laid out in memory to allow cores quick access to |
218 | * every 16th queue. This reduces cache thrashing when you are | 218 | * every 16th queue. This reduces cache thrashing when you are |
219 | * running 16 queues per port to support lockless operation. | 219 | * running 16 queues per port to support lockless operation. |
220 | */ | 220 | */ |
diff --git a/drivers/staging/octeon/cvmx-fpa.h b/drivers/staging/octeon/cvmx-fpa.h index 50a8c91778fa..1f04f9658736 100644 --- a/drivers/staging/octeon/cvmx-fpa.h +++ b/drivers/staging/octeon/cvmx-fpa.h | |||
@@ -195,7 +195,7 @@ static inline void cvmx_fpa_async_alloc(uint64_t scr_addr, uint64_t pool) | |||
195 | cvmx_fpa_iobdma_data_t data; | 195 | cvmx_fpa_iobdma_data_t data; |
196 | 196 | ||
197 | /* | 197 | /* |
198 | * Hardware only uses 64 bit alligned locations, so convert | 198 | * Hardware only uses 64 bit aligned locations, so convert |
199 | * from byte address to 64-bit index | 199 | * from byte address to 64-bit index |
200 | */ | 200 | */ |
201 | data.s.scraddr = scr_addr >> 3; | 201 | data.s.scraddr = scr_addr >> 3; |
diff --git a/drivers/staging/octeon/cvmx-helper-board.h b/drivers/staging/octeon/cvmx-helper-board.h index 611a8e03c216..b465bec43553 100644 --- a/drivers/staging/octeon/cvmx-helper-board.h +++ b/drivers/staging/octeon/cvmx-helper-board.h | |||
@@ -81,7 +81,7 @@ extern int cvmx_helper_board_get_mii_address(int ipd_port); | |||
81 | * @phy_addr: The address of the PHY to program | 81 | * @phy_addr: The address of the PHY to program |
82 | * @link_flags: | 82 | * @link_flags: |
83 | * Flags to control autonegotiation. Bit 0 is autonegotiation | 83 | * Flags to control autonegotiation. Bit 0 is autonegotiation |
84 | * enable/disable to maintain backware compatability. | 84 | * enable/disable to maintain backware compatibility. |
85 | * @link_info: Link speed to program. If the speed is zero and autonegotiation | 85 | * @link_info: Link speed to program. If the speed is zero and autonegotiation |
86 | * is enabled, all possible negotiation speeds are advertised. | 86 | * is enabled, all possible negotiation speeds are advertised. |
87 | * | 87 | * |
diff --git a/drivers/staging/octeon/cvmx-helper-util.c b/drivers/staging/octeon/cvmx-helper-util.c index 41ef8a40bb03..131182bf5abb 100644 --- a/drivers/staging/octeon/cvmx-helper-util.c +++ b/drivers/staging/octeon/cvmx-helper-util.c | |||
@@ -362,7 +362,7 @@ int __cvmx_helper_setup_gmx(int interface, int num_ports) | |||
362 | } | 362 | } |
363 | 363 | ||
364 | /** | 364 | /** |
365 | * Returns the IPD/PKO port number for a port on teh given | 365 | * Returns the IPD/PKO port number for a port on the given |
366 | * interface. | 366 | * interface. |
367 | * | 367 | * |
368 | * @interface: Interface to use | 368 | * @interface: Interface to use |
diff --git a/drivers/staging/octeon/cvmx-helper.c b/drivers/staging/octeon/cvmx-helper.c index 591506643d02..e9c5c836ceff 100644 --- a/drivers/staging/octeon/cvmx-helper.c +++ b/drivers/staging/octeon/cvmx-helper.c | |||
@@ -691,7 +691,7 @@ int __cvmx_helper_errata_fix_ipd_ptr_alignment(void) | |||
691 | 691 | ||
692 | if (!retry_cnt) | 692 | if (!retry_cnt) |
693 | cvmx_dprintf("WARNING: FIX_IPD_PTR_ALIGNMENT " | 693 | cvmx_dprintf("WARNING: FIX_IPD_PTR_ALIGNMENT " |
694 | "get_work() timeout occured.\n"); | 694 | "get_work() timeout occurred.\n"); |
695 | 695 | ||
696 | /* Free packet */ | 696 | /* Free packet */ |
697 | if (work) | 697 | if (work) |
diff --git a/drivers/staging/octeon/cvmx-mdio.h b/drivers/staging/octeon/cvmx-mdio.h index f45dc49512f2..d88ab8d8e37d 100644 --- a/drivers/staging/octeon/cvmx-mdio.h +++ b/drivers/staging/octeon/cvmx-mdio.h | |||
@@ -254,7 +254,7 @@ typedef union { | |||
254 | #define MDIO_CLAUSE_45_READ_INC 2 | 254 | #define MDIO_CLAUSE_45_READ_INC 2 |
255 | #define MDIO_CLAUSE_45_READ 3 | 255 | #define MDIO_CLAUSE_45_READ 3 |
256 | 256 | ||
257 | /* MMD identifiers, mostly for accessing devices withing XENPAK modules. */ | 257 | /* MMD identifiers, mostly for accessing devices within XENPAK modules. */ |
258 | #define CVMX_MMD_DEVICE_PMA_PMD 1 | 258 | #define CVMX_MMD_DEVICE_PMA_PMD 1 |
259 | #define CVMX_MMD_DEVICE_WIS 2 | 259 | #define CVMX_MMD_DEVICE_WIS 2 |
260 | #define CVMX_MMD_DEVICE_PCS 3 | 260 | #define CVMX_MMD_DEVICE_PCS 3 |
diff --git a/drivers/staging/octeon/cvmx-pko.h b/drivers/staging/octeon/cvmx-pko.h index f068c1982497..de3412aada5d 100644 --- a/drivers/staging/octeon/cvmx-pko.h +++ b/drivers/staging/octeon/cvmx-pko.h | |||
@@ -98,7 +98,7 @@ typedef enum { | |||
98 | /* | 98 | /* |
99 | * PKO doesn't do any locking. It is the responsibility of the | 99 | * PKO doesn't do any locking. It is the responsibility of the |
100 | * application to make sure that no other core is accessing | 100 | * application to make sure that no other core is accessing |
101 | * the same queue at the smae time | 101 | * the same queue at the same time |
102 | */ | 102 | */ |
103 | CVMX_PKO_LOCK_NONE = 0, | 103 | CVMX_PKO_LOCK_NONE = 0, |
104 | /* | 104 | /* |
@@ -324,7 +324,7 @@ static inline void cvmx_pko_doorbell(uint64_t port, uint64_t queue, | |||
324 | * - CVMX_PKO_LOCK_NONE | 324 | * - CVMX_PKO_LOCK_NONE |
325 | * - PKO doesn't do any locking. It is the responsibility | 325 | * - PKO doesn't do any locking. It is the responsibility |
326 | * of the application to make sure that no other core | 326 | * of the application to make sure that no other core |
327 | * is accessing the same queue at the smae time. | 327 | * is accessing the same queue at the same time. |
328 | * - CVMX_PKO_LOCK_ATOMIC_TAG | 328 | * - CVMX_PKO_LOCK_ATOMIC_TAG |
329 | * - PKO performs an atomic tagswitch to insure exclusive | 329 | * - PKO performs an atomic tagswitch to insure exclusive |
330 | * access to the output queue. This will maintain | 330 | * access to the output queue. This will maintain |
diff --git a/drivers/staging/octeon/cvmx-pow.h b/drivers/staging/octeon/cvmx-pow.h index bf9e069a898c..999aefe3274c 100644 --- a/drivers/staging/octeon/cvmx-pow.h +++ b/drivers/staging/octeon/cvmx-pow.h | |||
@@ -1492,8 +1492,8 @@ static inline void cvmx_pow_tag_sw_full(cvmx_wqe_t *wqp, uint32_t tag, | |||
1492 | /** | 1492 | /** |
1493 | * Switch to a NULL tag, which ends any ordering or | 1493 | * Switch to a NULL tag, which ends any ordering or |
1494 | * synchronization provided by the POW for the current | 1494 | * synchronization provided by the POW for the current |
1495 | * work queue entry. This operation completes immediatly, | 1495 | * work queue entry. This operation completes immediately, |
1496 | * so completetion should not be waited for. | 1496 | * so completion should not be waited for. |
1497 | * This function does NOT wait for previous tag switches to complete, | 1497 | * This function does NOT wait for previous tag switches to complete, |
1498 | * so the caller must ensure that any previous tag switches have completed. | 1498 | * so the caller must ensure that any previous tag switches have completed. |
1499 | */ | 1499 | */ |
@@ -1532,8 +1532,8 @@ static inline void cvmx_pow_tag_sw_null_nocheck(void) | |||
1532 | /** | 1532 | /** |
1533 | * Switch to a NULL tag, which ends any ordering or | 1533 | * Switch to a NULL tag, which ends any ordering or |
1534 | * synchronization provided by the POW for the current | 1534 | * synchronization provided by the POW for the current |
1535 | * work queue entry. This operation completes immediatly, | 1535 | * work queue entry. This operation completes immediately, |
1536 | * so completetion should not be waited for. | 1536 | * so completion should not be waited for. |
1537 | * This function waits for any pending tag switches to complete | 1537 | * This function waits for any pending tag switches to complete |
1538 | * before requesting the switch to NULL. | 1538 | * before requesting the switch to NULL. |
1539 | */ | 1539 | */ |
@@ -1672,7 +1672,7 @@ static inline void cvmx_pow_set_priority(uint64_t core_num, | |||
1672 | 1672 | ||
1673 | /** | 1673 | /** |
1674 | * Performs a tag switch and then an immediate deschedule. This completes | 1674 | * Performs a tag switch and then an immediate deschedule. This completes |
1675 | * immediatly, so completion must not be waited for. This function does NOT | 1675 | * immediately, so completion must not be waited for. This function does NOT |
1676 | * update the wqe in DRAM to match arguments. | 1676 | * update the wqe in DRAM to match arguments. |
1677 | * | 1677 | * |
1678 | * This function does NOT wait for any prior tag switches to complete, so the | 1678 | * This function does NOT wait for any prior tag switches to complete, so the |
@@ -1758,7 +1758,7 @@ static inline void cvmx_pow_tag_sw_desched_nocheck( | |||
1758 | 1758 | ||
1759 | /** | 1759 | /** |
1760 | * Performs a tag switch and then an immediate deschedule. This completes | 1760 | * Performs a tag switch and then an immediate deschedule. This completes |
1761 | * immediatly, so completion must not be waited for. This function does NOT | 1761 | * immediately, so completion must not be waited for. This function does NOT |
1762 | * update the wqe in DRAM to match arguments. | 1762 | * update the wqe in DRAM to match arguments. |
1763 | * | 1763 | * |
1764 | * This function waits for any prior tag switches to complete, so the | 1764 | * This function waits for any prior tag switches to complete, so the |
diff --git a/drivers/staging/octeon/ethernet-util.h b/drivers/staging/octeon/ethernet-util.h index 23467563fe57..c745a72a0594 100644 --- a/drivers/staging/octeon/ethernet-util.h +++ b/drivers/staging/octeon/ethernet-util.h | |||
@@ -55,7 +55,7 @@ static inline int INTERFACE(int ipd_port) | |||
55 | return 2; | 55 | return 2; |
56 | else if (ipd_port < 40) /* Interface 3 for loopback */ | 56 | else if (ipd_port < 40) /* Interface 3 for loopback */ |
57 | return 3; | 57 | return 3; |
58 | else if (ipd_port == 40) /* Non existant interface for POW0 */ | 58 | else if (ipd_port == 40) /* Non existent interface for POW0 */ |
59 | return 4; | 59 | return 4; |
60 | else | 60 | else |
61 | panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port); | 61 | panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port); |
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c index b154be7a2fe6..b5d21f6497f9 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c +++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | |||
@@ -80,7 +80,7 @@ static int dcon_init_xo_1(struct dcon_priv *dcon) | |||
80 | lob &= ~(1 << DCON_IRQ); | 80 | lob &= ~(1 << DCON_IRQ); |
81 | outb(lob, 0x4d0); | 81 | outb(lob, 0x4d0); |
82 | 82 | ||
83 | /* Register the interupt handler */ | 83 | /* Register the interrupt handler */ |
84 | if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", dcon)) { | 84 | if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", dcon)) { |
85 | printk(KERN_ERR "olpc-dcon: failed to request DCON's irq\n"); | 85 | printk(KERN_ERR "olpc-dcon: failed to request DCON's irq\n"); |
86 | goto err_req_irq; | 86 | goto err_req_irq; |
diff --git a/drivers/staging/pohmelfs/crypto.c b/drivers/staging/pohmelfs/crypto.c index 6540864216c8..5cca24fcf6ca 100644 --- a/drivers/staging/pohmelfs/crypto.c +++ b/drivers/staging/pohmelfs/crypto.c | |||
@@ -745,7 +745,7 @@ static int pohmelfs_crypto_init_handshake(struct pohmelfs_sb *psb) | |||
745 | 745 | ||
746 | /* | 746 | /* |
747 | * At this point NETFS_CAPABILITIES response command | 747 | * At this point NETFS_CAPABILITIES response command |
748 | * should setup superblock in a way, which is acceptible | 748 | * should setup superblock in a way, which is acceptable |
749 | * for both client and server, so if server refuses connection, | 749 | * for both client and server, so if server refuses connection, |
750 | * it will send error in transaction response. | 750 | * it will send error in transaction response. |
751 | */ | 751 | */ |
diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c index c45b09ed0d35..ca098cabc2bc 100644 --- a/drivers/staging/quatech_usb2/quatech_usb2.c +++ b/drivers/staging/quatech_usb2/quatech_usb2.c | |||
@@ -148,7 +148,7 @@ static struct usb_driver quausb2_usb_driver = { | |||
148 | * value of the line status flags from the port | 148 | * value of the line status flags from the port |
149 | * @shadowMSR: Last received state of the modem status register, holds | 149 | * @shadowMSR: Last received state of the modem status register, holds |
150 | * the value of the modem status received from the port | 150 | * the value of the modem status received from the port |
151 | * @rcv_flush: Flag indicating that a receive flush has occured on | 151 | * @rcv_flush: Flag indicating that a receive flush has occurred on |
152 | * the hardware. | 152 | * the hardware. |
153 | * @xmit_flush: Flag indicating that a transmit flush has been processed by | 153 | * @xmit_flush: Flag indicating that a transmit flush has been processed by |
154 | * the hardware. | 154 | * the hardware. |
@@ -156,7 +156,7 @@ static struct usb_driver quausb2_usb_driver = { | |||
156 | * includes the size (excluding header) of URBs that have been submitted but | 156 | * includes the size (excluding header) of URBs that have been submitted but |
157 | * have not yet been sent to to the device, and bytes that have been sent out | 157 | * have not yet been sent to to the device, and bytes that have been sent out |
158 | * of the port but not yet reported sent by the "xmit_empty" messages (which | 158 | * of the port but not yet reported sent by the "xmit_empty" messages (which |
159 | * indicate the number of bytes sent each time they are recieved, despite the | 159 | * indicate the number of bytes sent each time they are received, despite the |
160 | * misleading name). | 160 | * misleading name). |
161 | * - Starts at zero when port is initialised. | 161 | * - Starts at zero when port is initialised. |
162 | * - is incremented by the size of the data to be written (no headers) | 162 | * - is incremented by the size of the data to be written (no headers) |
@@ -649,7 +649,7 @@ static void qt2_close(struct usb_serial_port *port) | |||
649 | /* although the USB side is now empty, the UART itself may | 649 | /* although the USB side is now empty, the UART itself may |
650 | * still be pushing characters out over the line, so we have to | 650 | * still be pushing characters out over the line, so we have to |
651 | * wait testing the actual line status until the lines change | 651 | * wait testing the actual line status until the lines change |
652 | * indicating that the data is done transfering. */ | 652 | * indicating that the data is done transferring. */ |
653 | /* FIXME: slow this polling down so it doesn't run the USB bus flat out | 653 | /* FIXME: slow this polling down so it doesn't run the USB bus flat out |
654 | * if it actually has to spend any time in this loop (which it normally | 654 | * if it actually has to spend any time in this loop (which it normally |
655 | * doesn't because the buffer is nearly empty) */ | 655 | * doesn't because the buffer is nearly empty) */ |
@@ -726,7 +726,7 @@ static int qt2_write(struct tty_struct *tty, struct usb_serial_port *port, | |||
726 | return 0; | 726 | return 0; |
727 | } else if (port_extra->tx_pending_bytes >= QT2_FIFO_DEPTH) { | 727 | } else if (port_extra->tx_pending_bytes >= QT2_FIFO_DEPTH) { |
728 | /* buffer is full (==). > should not occur, but would indicate | 728 | /* buffer is full (==). > should not occur, but would indicate |
729 | * that an overflow had occured */ | 729 | * that an overflow had occurred */ |
730 | dbg("%s(): port transmit buffer is full!", __func__); | 730 | dbg("%s(): port transmit buffer is full!", __func__); |
731 | /* schedule_work(&port->work); commented in vendor driver */ | 731 | /* schedule_work(&port->work); commented in vendor driver */ |
732 | return 0; | 732 | return 0; |
@@ -823,7 +823,7 @@ static int qt2_write_room(struct tty_struct *tty) | |||
823 | * reduce the free space count by the size of the dispatched write. | 823 | * reduce the free space count by the size of the dispatched write. |
824 | * When a "transmit empty" message comes back up the USB read stream, | 824 | * When a "transmit empty" message comes back up the USB read stream, |
825 | * we decrement the count by the number of bytes reported sent, thus | 825 | * we decrement the count by the number of bytes reported sent, thus |
826 | * keeping track of the difference between sent and recieved bytes. | 826 | * keeping track of the difference between sent and received bytes. |
827 | */ | 827 | */ |
828 | 828 | ||
829 | room = (QT2_FIFO_DEPTH - port_extra->tx_pending_bytes); | 829 | room = (QT2_FIFO_DEPTH - port_extra->tx_pending_bytes); |
@@ -1795,7 +1795,7 @@ static void qt2_process_rx_char(struct usb_serial_port *port, | |||
1795 | } | 1795 | } |
1796 | } | 1796 | } |
1797 | 1797 | ||
1798 | /** @brief Retreive the value of a register from the device | 1798 | /** @brief Retrieve the value of a register from the device |
1799 | * | 1799 | * |
1800 | * Issues a GET_REGISTER vendor-spcific request over the USB control | 1800 | * Issues a GET_REGISTER vendor-spcific request over the USB control |
1801 | * pipe to obtain a value back from a specific register on a specific | 1801 | * pipe to obtain a value back from a specific register on a specific |
diff --git a/drivers/staging/rt2860/chip/rtmp_phy.h b/drivers/staging/rt2860/chip/rtmp_phy.h index 98454df30a22..a52221f1294e 100644 --- a/drivers/staging/rt2860/chip/rtmp_phy.h +++ b/drivers/staging/rt2860/chip/rtmp_phy.h | |||
@@ -467,7 +467,7 @@ | |||
467 | DBGPRINT_ERR("BBP write R%d=0x%x fail. BusyCnt= %d.bPCIclkOff = %d. \n", _I, BbpCsr.word, BusyCnt, (_A)->bPCIclkOff); \ | 467 | DBGPRINT_ERR("BBP write R%d=0x%x fail. BusyCnt= %d.bPCIclkOff = %d. \n", _I, BbpCsr.word, BusyCnt, (_A)->bPCIclkOff); \ |
468 | } \ | 468 | } \ |
469 | } else { \ | 469 | } else { \ |
470 | DBGPRINT_ERR("****** BBP_Write_Latch Buffer exceeds max boundry ****** \n"); \ | 470 | DBGPRINT_ERR("****** BBP_Write_Latch Buffer exceeds max boundary ****** \n"); \ |
471 | } \ | 471 | } \ |
472 | } | 472 | } |
473 | #endif /* RTMP_MAC_PCI // */ | 473 | #endif /* RTMP_MAC_PCI // */ |
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 62f6f6be4acb..133bc1b87d2c 100644 --- a/drivers/staging/rt2860/common/ba_action.c +++ b/drivers/staging/rt2860/common/ba_action.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "../rt_config.h" | 28 | #include "../rt_config.h" |
29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
30 | 30 | ||
31 | #define BA_ORI_INIT_SEQ (pEntry->TxSeq[TID]) /*1 // inital sequence number of BA session */ | 31 | #define BA_ORI_INIT_SEQ (pEntry->TxSeq[TID]) /*1 // initial sequence number of BA session */ |
32 | 32 | ||
33 | #define ORI_SESSION_MAX_RETRY 8 | 33 | #define ORI_SESSION_MAX_RETRY 8 |
34 | #define ORI_BA_SESSION_TIMEOUT (2000) /* ms */ | 34 | #define ORI_BA_SESSION_TIMEOUT (2000) /* ms */ |
@@ -1487,7 +1487,7 @@ static void ba_enqueue_reordering_packet(struct rt_rtmp_adapter *pAd, | |||
1487 | 1487 | ||
1488 | /* | 1488 | /* |
1489 | * flush all pending reordering mpdus | 1489 | * flush all pending reordering mpdus |
1490 | * and receving mpdu to upper layer | 1490 | * and receiving mpdu to upper layer |
1491 | * make tcp/ip to take care reordering mechanism | 1491 | * make tcp/ip to take care reordering mechanism |
1492 | */ | 1492 | */ |
1493 | /*ba_refresh_reordering_mpdus(pAd, pBAEntry); */ | 1493 | /*ba_refresh_reordering_mpdus(pAd, pBAEntry); */ |
diff --git a/drivers/staging/rt2860/common/cmm_aes.c b/drivers/staging/rt2860/common/cmm_aes.c index a99879bada42..d70d229a6e53 100644 --- a/drivers/staging/rt2860/common/cmm_aes.c +++ b/drivers/staging/rt2860/common/cmm_aes.c | |||
@@ -858,7 +858,7 @@ static uint32 KT1[256]; | |||
858 | static uint32 KT2[256]; | 858 | static uint32 KT2[256]; |
859 | static uint32 KT3[256]; | 859 | static uint32 KT3[256]; |
860 | 860 | ||
861 | /* platform-independant 32-bit integer manipulation macros */ | 861 | /* platform-independent 32-bit integer manipulation macros */ |
862 | 862 | ||
863 | #define GET_UINT32(n,b,i) \ | 863 | #define GET_UINT32(n,b,i) \ |
864 | { \ | 864 | { \ |
diff --git a/drivers/staging/rt2860/common/cmm_cfg.c b/drivers/staging/rt2860/common/cmm_cfg.c index 24f439378439..727f79929258 100644 --- a/drivers/staging/rt2860/common/cmm_cfg.c +++ b/drivers/staging/rt2860/common/cmm_cfg.c | |||
@@ -223,7 +223,7 @@ int RT_CfgSetWepKey(struct rt_rtmp_adapter *pAd, | |||
223 | pAdapter Pointer to our adapter | 223 | pAdapter Pointer to our adapter |
224 | keyString WPA pre-shared key string | 224 | keyString WPA pre-shared key string |
225 | pHashStr String used for password hash function | 225 | pHashStr String used for password hash function |
226 | hashStrLen Lenght of the hash string | 226 | hashStrLen Length of the hash string |
227 | pPMKBuf Output buffer of WPAPSK key | 227 | pPMKBuf Output buffer of WPAPSK key |
228 | 228 | ||
229 | Return: | 229 | Return: |
diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c index f6c193cb84ee..33799e1449ae 100644 --- a/drivers/staging/rt2860/common/cmm_data.c +++ b/drivers/staging/rt2860/common/cmm_data.c | |||
@@ -337,7 +337,7 @@ int MlmeHardTransmitMgmtRing(struct rt_rtmp_adapter *pAd, | |||
337 | 337 | ||
338 | /* */ | 338 | /* */ |
339 | /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ | 339 | /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ |
340 | /* Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ | 340 | /* Data-Null packets also pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ |
341 | /* if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL)) */ | 341 | /* if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL)) */ |
342 | { | 342 | { |
343 | if ((pHeader_802_11->FC.SubType == SUBTYPE_ACTION) || | 343 | if ((pHeader_802_11->FC.SubType == SUBTYPE_ACTION) || |
@@ -1933,7 +1933,7 @@ BOOLEAN RTMPCheckEtherType(struct rt_rtmp_adapter *pAd, void *pPacket) | |||
1933 | 1933 | ||
1934 | if (TypeLen <= 1500) { /* 802.3, 802.3 LLC */ | 1934 | if (TypeLen <= 1500) { /* 802.3, 802.3 LLC */ |
1935 | /* | 1935 | /* |
1936 | DestMAC(6) + SrcMAC(6) + Lenght(2) + | 1936 | DestMAC(6) + SrcMAC(6) + Length(2) + |
1937 | DSAP(1) + SSAP(1) + Control(1) + | 1937 | DSAP(1) + SSAP(1) + Control(1) + |
1938 | if the DSAP = 0xAA, SSAP=0xAA, Contorl = 0x03, it has a 5-bytes SNAP header. | 1938 | if the DSAP = 0xAA, SSAP=0xAA, Contorl = 0x03, it has a 5-bytes SNAP header. |
1939 | => + SNAP (5, OriginationID(3) + etherType(2)) | 1939 | => + SNAP (5, OriginationID(3) + etherType(2)) |
diff --git a/drivers/staging/rt2860/common/cmm_data_pci.c b/drivers/staging/rt2860/common/cmm_data_pci.c index 7af59ff9e220..bef0bbd8cef7 100644 --- a/drivers/staging/rt2860/common/cmm_data_pci.c +++ b/drivers/staging/rt2860/common/cmm_data_pci.c | |||
@@ -438,13 +438,13 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd, | |||
438 | /* Add Rx size to channel load counter, we should ignore error counts */ | 438 | /* Add Rx size to channel load counter, we should ignore error counts */ |
439 | pAd->StaCfg.CLBusyBytes += (pRxD->SDL0 + 14); | 439 | pAd->StaCfg.CLBusyBytes += (pRxD->SDL0 + 14); |
440 | 440 | ||
441 | /* Drop ToDs promiscous frame, it is opened due to CCX 2 channel load statistics */ | 441 | /* Drop ToDs promiscuous frame, it is opened due to CCX 2 channel load statistics */ |
442 | if (pHeader != NULL) { | 442 | if (pHeader != NULL) { |
443 | if (pHeader->FC.ToDs) { | 443 | if (pHeader->FC.ToDs) { |
444 | return (NDIS_STATUS_FAILURE); | 444 | return (NDIS_STATUS_FAILURE); |
445 | } | 445 | } |
446 | } | 446 | } |
447 | /* Drop not U2M frames, cant's drop here because we will drop beacon in this case */ | 447 | /* Drop not U2M frames, can't's drop here because we will drop beacon in this case */ |
448 | /* I am kind of doubting the U2M bit operation */ | 448 | /* I am kind of doubting the U2M bit operation */ |
449 | /* if (pRxD->U2M == 0) */ | 449 | /* if (pRxD->U2M == 0) */ |
450 | /* return(NDIS_STATUS_FAILURE); */ | 450 | /* return(NDIS_STATUS_FAILURE); */ |
@@ -939,7 +939,7 @@ int MlmeHardTransmitTxRing(struct rt_rtmp_adapter *pAd, | |||
939 | /* */ | 939 | /* */ |
940 | /* */ | 940 | /* */ |
941 | /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ | 941 | /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ |
942 | /* Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ | 942 | /* Data-Null packets also pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ |
943 | if (pHeader_802_11->FC.Type != BTYPE_DATA) { | 943 | if (pHeader_802_11->FC.Type != BTYPE_DATA) { |
944 | if ((pHeader_802_11->FC.SubType == SUBTYPE_PROBE_REQ) | 944 | if ((pHeader_802_11->FC.SubType == SUBTYPE_PROBE_REQ) |
945 | || !(pAd->CommonCfg.bAPSDCapable | 945 | || !(pAd->CommonCfg.bAPSDCapable |
diff --git a/drivers/staging/rt2860/common/cmm_data_usb.c b/drivers/staging/rt2860/common/cmm_data_usb.c index 7c56c2f51987..5637857ae9eb 100644 --- a/drivers/staging/rt2860/common/cmm_data_usb.c +++ b/drivers/staging/rt2860/common/cmm_data_usb.c | |||
@@ -702,7 +702,7 @@ Arguments: | |||
702 | *pRxPending pending received packet flag | 702 | *pRxPending pending received packet flag |
703 | 703 | ||
704 | Return Value: | 704 | Return Value: |
705 | the recieved packet | 705 | the received packet |
706 | 706 | ||
707 | Note: | 707 | Note: |
708 | ======================================================================== | 708 | ======================================================================== |
@@ -850,7 +850,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd, | |||
850 | /* Add Rx size to channel load counter, we should ignore error counts */ | 850 | /* Add Rx size to channel load counter, we should ignore error counts */ |
851 | pAd->StaCfg.CLBusyBytes += (pRxWI->MPDUtotalByteCount + 14); | 851 | pAd->StaCfg.CLBusyBytes += (pRxWI->MPDUtotalByteCount + 14); |
852 | 852 | ||
853 | /* Drop ToDs promiscous frame, it is opened due to CCX 2 channel load statistics */ | 853 | /* Drop ToDs promiscuous frame, it is opened due to CCX 2 channel load statistics */ |
854 | if (pHeader->FC.ToDs) { | 854 | if (pHeader->FC.ToDs) { |
855 | DBGPRINT_RAW(RT_DEBUG_ERROR, ("Err;FC.ToDs\n")); | 855 | DBGPRINT_RAW(RT_DEBUG_ERROR, ("Err;FC.ToDs\n")); |
856 | return NDIS_STATUS_FAILURE; | 856 | return NDIS_STATUS_FAILURE; |
@@ -860,7 +860,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd, | |||
860 | DBGPRINT_RAW(RT_DEBUG_ERROR, ("received packet too long\n")); | 860 | DBGPRINT_RAW(RT_DEBUG_ERROR, ("received packet too long\n")); |
861 | return NDIS_STATUS_FAILURE; | 861 | return NDIS_STATUS_FAILURE; |
862 | } | 862 | } |
863 | /* Drop not U2M frames, cant's drop here because we will drop beacon in this case */ | 863 | /* Drop not U2M frames, can't's drop here because we will drop beacon in this case */ |
864 | /* I am kind of doubting the U2M bit operation */ | 864 | /* I am kind of doubting the U2M bit operation */ |
865 | /* if (pRxD->U2M == 0) */ | 865 | /* if (pRxD->U2M == 0) */ |
866 | /* return(NDIS_STATUS_FAILURE); */ | 866 | /* return(NDIS_STATUS_FAILURE); */ |
diff --git a/drivers/staging/rt2860/common/cmm_mac_pci.c b/drivers/staging/rt2860/common/cmm_mac_pci.c index 21eed2507e1c..d06f0a6dc379 100644 --- a/drivers/staging/rt2860/common/cmm_mac_pci.c +++ b/drivers/staging/rt2860/common/cmm_mac_pci.c | |||
@@ -1446,7 +1446,7 @@ BOOLEAN RT28xxPciAsicRadioOff(struct rt_rtmp_adapter *pAd, | |||
1446 | pAd->CheckDmaBusyCount = 0; | 1446 | pAd->CheckDmaBusyCount = 0; |
1447 | } | 1447 | } |
1448 | */ | 1448 | */ |
1449 | /*KH Debug:My original codes have the follwoing codes, but currecnt codes do not have it. */ | 1449 | /*KH Debug:My original codes have the following codes, but currecnt codes do not have it. */ |
1450 | /* Disable for stability. If PCIE Link Control is modified for advance power save, re-covery this code segment. */ | 1450 | /* Disable for stability. If PCIE Link Control is modified for advance power save, re-covery this code segment. */ |
1451 | RTMP_IO_WRITE32(pAd, PBF_SYS_CTRL, 0x1280); | 1451 | RTMP_IO_WRITE32(pAd, PBF_SYS_CTRL, 0x1280); |
1452 | /*OPSTATUS_SET_FLAG(pAd, fOP_STATUS_CLKSELECT_40MHZ); */ | 1452 | /*OPSTATUS_SET_FLAG(pAd, fOP_STATUS_CLKSELECT_40MHZ); */ |
diff --git a/drivers/staging/rt2860/common/cmm_sanity.c b/drivers/staging/rt2860/common/cmm_sanity.c index 6b003c903444..3bfb4ad00c1a 100644 --- a/drivers/staging/rt2860/common/cmm_sanity.c +++ b/drivers/staging/rt2860/common/cmm_sanity.c | |||
@@ -67,7 +67,7 @@ BOOLEAN MlmeAddBAReqSanity(struct rt_rtmp_adapter *pAd, | |||
67 | 67 | ||
68 | if ((MsgLen != sizeof(struct rt_mlme_addba_req))) { | 68 | if ((MsgLen != sizeof(struct rt_mlme_addba_req))) { |
69 | DBGPRINT(RT_DEBUG_TRACE, | 69 | DBGPRINT(RT_DEBUG_TRACE, |
70 | ("MlmeAddBAReqSanity fail - message lenght not correct.\n")); | 70 | ("MlmeAddBAReqSanity fail - message length not correct.\n")); |
71 | return FALSE; | 71 | return FALSE; |
72 | } | 72 | } |
73 | 73 | ||
@@ -104,7 +104,7 @@ BOOLEAN MlmeDelBAReqSanity(struct rt_rtmp_adapter *pAd, void * Msg, unsigned lon | |||
104 | 104 | ||
105 | if ((MsgLen != sizeof(struct rt_mlme_delba_req))) { | 105 | if ((MsgLen != sizeof(struct rt_mlme_delba_req))) { |
106 | DBGPRINT(RT_DEBUG_ERROR, | 106 | DBGPRINT(RT_DEBUG_ERROR, |
107 | ("MlmeDelBAReqSanity fail - message lenght not correct.\n")); | 107 | ("MlmeDelBAReqSanity fail - message length not correct.\n")); |
108 | return FALSE; | 108 | return FALSE; |
109 | } | 109 | } |
110 | 110 | ||
diff --git a/drivers/staging/rt2860/common/cmm_sync.c b/drivers/staging/rt2860/common/cmm_sync.c index f84194da47bc..aefe1b774650 100644 --- a/drivers/staging/rt2860/common/cmm_sync.c +++ b/drivers/staging/rt2860/common/cmm_sync.c | |||
@@ -694,7 +694,7 @@ void ScanNextChannel(struct rt_rtmp_adapter *pAd) | |||
694 | MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen); | 694 | MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen); |
695 | MlmeFreeMemory(pAd, pOutBuffer); | 695 | MlmeFreeMemory(pAd, pOutBuffer); |
696 | } | 696 | } |
697 | /* For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe reponse */ | 697 | /* For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe response */ |
698 | 698 | ||
699 | pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN; | 699 | pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN; |
700 | } | 700 | } |
diff --git a/drivers/staging/rt2860/common/cmm_wpa.c b/drivers/staging/rt2860/common/cmm_wpa.c index 0040f45b629b..616ebec50c61 100644 --- a/drivers/staging/rt2860/common/cmm_wpa.c +++ b/drivers/staging/rt2860/common/cmm_wpa.c | |||
@@ -1222,7 +1222,7 @@ void PeerGroupMsg2Action(struct rt_rtmp_adapter *pAd, | |||
1222 | 1222 | ||
1223 | Note: | 1223 | Note: |
1224 | All these constants are defined in wpa.h | 1224 | All these constants are defined in wpa.h |
1225 | For supplicant, there is only EAPOL Key message avaliable | 1225 | For supplicant, there is only EAPOL Key message available |
1226 | 1226 | ||
1227 | ======================================================================== | 1227 | ======================================================================== |
1228 | */ | 1228 | */ |
@@ -1267,7 +1267,7 @@ BOOLEAN WpaMsgTypeSubst(u8 EAPType, int * MsgType) | |||
1267 | int prefix_len - the length of the label | 1267 | int prefix_len - the length of the label |
1268 | u8 *data - a specific data with variable length | 1268 | u8 *data - a specific data with variable length |
1269 | int data_len - the length of a specific data | 1269 | int data_len - the length of a specific data |
1270 | int len - the output lenght | 1270 | int len - the output length |
1271 | 1271 | ||
1272 | Return Value: | 1272 | Return Value: |
1273 | u8 *output - the calculated result | 1273 | u8 *output - the calculated result |
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index d9c3fd5c2166..e48eac0f3a29 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c | |||
@@ -632,7 +632,7 @@ void MlmeHalt(struct rt_rtmp_adapter *pAd) | |||
632 | pChipOps->AsicHaltAction(pAd); | 632 | pChipOps->AsicHaltAction(pAd); |
633 | } | 633 | } |
634 | 634 | ||
635 | RTMPusecDelay(5000); /* 5 msec to gurantee Ant Diversity timer canceled */ | 635 | RTMPusecDelay(5000); /* 5 msec to guarantee Ant Diversity timer canceled */ |
636 | 636 | ||
637 | MlmeQueueDestroy(&pAd->Mlme.Queue); | 637 | MlmeQueueDestroy(&pAd->Mlme.Queue); |
638 | NdisFreeSpinLock(&pAd->Mlme.TaskLock); | 638 | NdisFreeSpinLock(&pAd->Mlme.TaskLock); |
@@ -1107,14 +1107,14 @@ void MlmeSelectTxRateTable(struct rt_rtmp_adapter *pAd, | |||
1107 | *pInitTxRateIdx = | 1107 | *pInitTxRateIdx = |
1108 | RateSwitchTable11N1S[1]; | 1108 | RateSwitchTable11N1S[1]; |
1109 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1109 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1110 | ("DRS: unkown mode,default use 11N 1S AP \n")); | 1110 | ("DRS: unknown mode,default use 11N 1S AP \n")); |
1111 | } else { | 1111 | } else { |
1112 | *ppTable = RateSwitchTable11N2S; | 1112 | *ppTable = RateSwitchTable11N2S; |
1113 | *pTableSize = RateSwitchTable11N2S[0]; | 1113 | *pTableSize = RateSwitchTable11N2S[0]; |
1114 | *pInitTxRateIdx = | 1114 | *pInitTxRateIdx = |
1115 | RateSwitchTable11N2S[1]; | 1115 | RateSwitchTable11N2S[1]; |
1116 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1116 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1117 | ("DRS: unkown mode,default use 11N 2S AP \n")); | 1117 | ("DRS: unknown mode,default use 11N 2S AP \n")); |
1118 | } | 1118 | } |
1119 | } else { | 1119 | } else { |
1120 | if (pAd->CommonCfg.TxStream == 1) { | 1120 | if (pAd->CommonCfg.TxStream == 1) { |
@@ -1123,7 +1123,7 @@ void MlmeSelectTxRateTable(struct rt_rtmp_adapter *pAd, | |||
1123 | *pInitTxRateIdx = | 1123 | *pInitTxRateIdx = |
1124 | RateSwitchTable11N1S[1]; | 1124 | RateSwitchTable11N1S[1]; |
1125 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1125 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1126 | ("DRS: unkown mode,default use 11N 1S AP \n")); | 1126 | ("DRS: unknown mode,default use 11N 1S AP \n")); |
1127 | } else { | 1127 | } else { |
1128 | *ppTable = RateSwitchTable11N2SForABand; | 1128 | *ppTable = RateSwitchTable11N2SForABand; |
1129 | *pTableSize = | 1129 | *pTableSize = |
@@ -1131,11 +1131,11 @@ void MlmeSelectTxRateTable(struct rt_rtmp_adapter *pAd, | |||
1131 | *pInitTxRateIdx = | 1131 | *pInitTxRateIdx = |
1132 | RateSwitchTable11N2SForABand[1]; | 1132 | RateSwitchTable11N2SForABand[1]; |
1133 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1133 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1134 | ("DRS: unkown mode,default use 11N 2S AP \n")); | 1134 | ("DRS: unknown mode,default use 11N 2S AP \n")); |
1135 | } | 1135 | } |
1136 | } | 1136 | } |
1137 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1137 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1138 | ("DRS: unkown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n", | 1138 | ("DRS: unknown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n", |
1139 | pAd->StaActive.SupRateLen, | 1139 | pAd->StaActive.SupRateLen, |
1140 | pAd->StaActive.ExtRateLen, | 1140 | pAd->StaActive.ExtRateLen, |
1141 | pAd->StaActive.SupportedPhyInfo.MCSSet[0], | 1141 | pAd->StaActive.SupportedPhyInfo.MCSSet[0], |
@@ -1368,7 +1368,7 @@ void STAMlmePeriodicExec(struct rt_rtmp_adapter *pAd) | |||
1368 | if ((pAd->StaCfg.LastScanTime + | 1368 | if ((pAd->StaCfg.LastScanTime + |
1369 | 10 * OS_HZ) < pAd->Mlme.Now32) { | 1369 | 10 * OS_HZ) < pAd->Mlme.Now32) { |
1370 | DBGPRINT(RT_DEBUG_TRACE, | 1370 | DBGPRINT(RT_DEBUG_TRACE, |
1371 | ("MMCHK - Roaming, No eligable entry, try new scan!\n")); | 1371 | ("MMCHK - Roaming, No eligible entry, try new scan!\n")); |
1372 | pAd->StaCfg.ScanCnt = 2; | 1372 | pAd->StaCfg.ScanCnt = 2; |
1373 | pAd->StaCfg.LastScanTime = | 1373 | pAd->StaCfg.LastScanTime = |
1374 | pAd->Mlme.Now32; | 1374 | pAd->Mlme.Now32; |
@@ -2828,7 +2828,7 @@ void UpdateBasicRateBitmap(struct rt_rtmp_adapter *pAdapter) | |||
2828 | 2828 | ||
2829 | /* IRQL = PASSIVE_LEVEL */ | 2829 | /* IRQL = PASSIVE_LEVEL */ |
2830 | /* IRQL = DISPATCH_LEVEL */ | 2830 | /* IRQL = DISPATCH_LEVEL */ |
2831 | /* bLinkUp is to identify the inital link speed. */ | 2831 | /* bLinkUp is to identify the initial link speed. */ |
2832 | /* TRUE indicates the rate update at linkup, we should not try to set the rate at 54Mbps. */ | 2832 | /* TRUE indicates the rate update at linkup, we should not try to set the rate at 54Mbps. */ |
2833 | void MlmeUpdateTxRates(struct rt_rtmp_adapter *pAd, IN BOOLEAN bLinkUp, u8 apidx) | 2833 | void MlmeUpdateTxRates(struct rt_rtmp_adapter *pAd, IN BOOLEAN bLinkUp, u8 apidx) |
2834 | { | 2834 | { |
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c index d359a14f5d4d..5fa193eac0d3 100644 --- a/drivers/staging/rt2860/common/rtmp_init.c +++ b/drivers/staging/rt2860/common/rtmp_init.c | |||
@@ -2037,7 +2037,7 @@ void NICUpdateFifoStaCounters(struct rt_rtmp_adapter *pAd) | |||
2037 | 2037 | ||
2038 | pEntry->FIFOCount = 0; | 2038 | pEntry->FIFOCount = 0; |
2039 | pEntry->OneSecTxNoRetryOkCount++; | 2039 | pEntry->OneSecTxNoRetryOkCount++; |
2040 | /* update NoDataIdleCount when sucessful send packet to STA. */ | 2040 | /* update NoDataIdleCount when successful send packet to STA. */ |
2041 | pEntry->NoDataIdleCount = 0; | 2041 | pEntry->NoDataIdleCount = 0; |
2042 | pEntry->ContinueTxFailCnt = 0; | 2042 | pEntry->ContinueTxFailCnt = 0; |
2043 | } | 2043 | } |
@@ -2516,7 +2516,7 @@ void UserCfgInit(struct rt_rtmp_adapter *pAd) | |||
2516 | /*pAd->TurnAggrBulkInCount = 0; */ | 2516 | /*pAd->TurnAggrBulkInCount = 0; */ |
2517 | pAd->bUsbTxBulkAggre = 0; | 2517 | pAd->bUsbTxBulkAggre = 0; |
2518 | 2518 | ||
2519 | /* init as unsed value to ensure driver will set to MCU once. */ | 2519 | /* init as unused value to ensure driver will set to MCU once. */ |
2520 | pAd->LedIndicatorStrength = 0xFF; | 2520 | pAd->LedIndicatorStrength = 0xFF; |
2521 | 2521 | ||
2522 | pAd->CommonCfg.MaxPktOneTxBulk = 2; | 2522 | pAd->CommonCfg.MaxPktOneTxBulk = 2; |
@@ -3076,11 +3076,11 @@ void RTMPSetLED(struct rt_rtmp_adapter *pAd, u8 Status) | |||
3076 | ======================================================================== | 3076 | ======================================================================== |
3077 | 3077 | ||
3078 | Routine Description: | 3078 | Routine Description: |
3079 | Set LED Signal Stregth | 3079 | Set LED Signal Strength |
3080 | 3080 | ||
3081 | Arguments: | 3081 | Arguments: |
3082 | pAd Pointer to our adapter | 3082 | pAd Pointer to our adapter |
3083 | Dbm Signal Stregth | 3083 | Dbm Signal Strength |
3084 | 3084 | ||
3085 | Return Value: | 3085 | Return Value: |
3086 | None | 3086 | None |
@@ -3090,7 +3090,7 @@ void RTMPSetLED(struct rt_rtmp_adapter *pAd, u8 Status) | |||
3090 | Note: | 3090 | Note: |
3091 | Can be run on any IRQL level. | 3091 | Can be run on any IRQL level. |
3092 | 3092 | ||
3093 | According to Microsoft Zero Config Wireless Signal Stregth definition as belows. | 3093 | According to Microsoft Zero Config Wireless Signal Strength definition as belows. |
3094 | <= -90 No Signal | 3094 | <= -90 No Signal |
3095 | <= -81 Very Low | 3095 | <= -81 Very Low |
3096 | <= -71 Low | 3096 | <= -71 Low |
@@ -3118,7 +3118,7 @@ void RTMPSetSignalLED(struct rt_rtmp_adapter *pAd, IN NDIS_802_11_RSSI Dbm) | |||
3118 | nLed = 31; | 3118 | nLed = 31; |
3119 | 3119 | ||
3120 | /* */ | 3120 | /* */ |
3121 | /* Update Signal Stregth to firmware if changed. */ | 3121 | /* Update Signal Strength to firmware if changed. */ |
3122 | /* */ | 3122 | /* */ |
3123 | if (pAd->LedIndicatorStrength != nLed) { | 3123 | if (pAd->LedIndicatorStrength != nLed) { |
3124 | AsicSendCommandToMcu(pAd, 0x51, 0xff, nLed, | 3124 | AsicSendCommandToMcu(pAd, 0x51, 0xff, nLed, |
@@ -3166,7 +3166,7 @@ void RTMPEnableRxTx(struct rt_rtmp_adapter *pAd) | |||
3166 | if (pAd->CommonCfg.PSPXlink) | 3166 | if (pAd->CommonCfg.PSPXlink) |
3167 | rx_filter_flag = PSPXLINK; | 3167 | rx_filter_flag = PSPXLINK; |
3168 | else | 3168 | else |
3169 | rx_filter_flag = STANORMAL; /* Staion not drop control frame will fail WiFi Certification. */ | 3169 | rx_filter_flag = STANORMAL; /* Station not drop control frame will fail WiFi Certification. */ |
3170 | RTMP_IO_WRITE32(pAd, RX_FILTR_CFG, rx_filter_flag); | 3170 | RTMP_IO_WRITE32(pAd, RX_FILTR_CFG, rx_filter_flag); |
3171 | } | 3171 | } |
3172 | 3172 | ||
diff --git a/drivers/staging/rt2860/common/spectrum.c b/drivers/staging/rt2860/common/spectrum.c index c0d2f428069c..ceb622df12d7 100644 --- a/drivers/staging/rt2860/common/spectrum.c +++ b/drivers/staging/rt2860/common/spectrum.c | |||
@@ -1058,8 +1058,8 @@ static void InsertMeasureReqIE(struct rt_rtmp_adapter *pAd, | |||
1058 | 3. Measure Token. | 1058 | 3. Measure Token. |
1059 | 4. Measure Request Mode. | 1059 | 4. Measure Request Mode. |
1060 | 5. Measure Request Type. | 1060 | 5. Measure Request Type. |
1061 | 6. Length of Report Infomation | 1061 | 6. Length of Report Information |
1062 | 7. Pointer of Report Infomation Buffer. | 1062 | 7. Pointer of Report Information Buffer. |
1063 | 1063 | ||
1064 | Return : None. | 1064 | Return : None. |
1065 | ========================================================================== | 1065 | ========================================================================== |
@@ -1400,7 +1400,7 @@ static void StartDFSProcedure(struct rt_rtmp_adapter *pAd, | |||
1400 | Parametrs: | 1400 | Parametrs: |
1401 | 1. MLME message containing the received frame | 1401 | 1. MLME message containing the received frame |
1402 | 2. message length. | 1402 | 2. message length. |
1403 | 3. Channel switch announcement infomation buffer. | 1403 | 3. Channel switch announcement information buffer. |
1404 | 1404 | ||
1405 | Return : None. | 1405 | Return : None. |
1406 | ========================================================================== | 1406 | ========================================================================== |
@@ -1465,7 +1465,7 @@ static BOOLEAN PeerChSwAnnSanity(struct rt_rtmp_adapter *pAd, | |||
1465 | Parametrs: | 1465 | Parametrs: |
1466 | 1. MLME message containing the received frame | 1466 | 1. MLME message containing the received frame |
1467 | 2. message length. | 1467 | 2. message length. |
1468 | 3. Measurement request infomation buffer. | 1468 | 3. Measurement request information buffer. |
1469 | 1469 | ||
1470 | Return : None. | 1470 | Return : None. |
1471 | ========================================================================== | 1471 | ========================================================================== |
@@ -1538,8 +1538,8 @@ static BOOLEAN PeerMeasureReqSanity(struct rt_rtmp_adapter *pAd, | |||
1538 | Parametrs: | 1538 | Parametrs: |
1539 | 1. MLME message containing the received frame | 1539 | 1. MLME message containing the received frame |
1540 | 2. message length. | 1540 | 2. message length. |
1541 | 3. Measurement report infomation buffer. | 1541 | 3. Measurement report information buffer. |
1542 | 4. basic report infomation buffer. | 1542 | 4. basic report information buffer. |
1543 | 1543 | ||
1544 | Return : None. | 1544 | Return : None. |
1545 | ========================================================================== | 1545 | ========================================================================== |
diff --git a/drivers/staging/rt2860/mlme.h b/drivers/staging/rt2860/mlme.h index cd1ee3d7a91d..a285851692ee 100644 --- a/drivers/staging/rt2860/mlme.h +++ b/drivers/staging/rt2860/mlme.h | |||
@@ -374,7 +374,7 @@ struct PACKED rt_sec_cha_offset_ie { | |||
374 | struct rt_ht_phy_info { | 374 | struct rt_ht_phy_info { |
375 | BOOLEAN bHtEnable; /* If we should use ht rate. */ | 375 | BOOLEAN bHtEnable; /* If we should use ht rate. */ |
376 | BOOLEAN bPreNHt; /* If we should use ht rate. */ | 376 | BOOLEAN bPreNHt; /* If we should use ht rate. */ |
377 | /*Substract from HT Capability IE */ | 377 | /*Subtract from HT Capability IE */ |
378 | u8 MCSSet[16]; | 378 | u8 MCSSet[16]; |
379 | }; | 379 | }; |
380 | 380 | ||
@@ -392,7 +392,7 @@ struct rt_ht_capability { | |||
392 | u16 AmsduSize:1; /* Max receiving A-MSDU size */ | 392 | u16 AmsduSize:1; /* Max receiving A-MSDU size */ |
393 | u16 rsv:5; | 393 | u16 rsv:5; |
394 | 394 | ||
395 | /*Substract from Addiont HT INFO IE */ | 395 | /*Subtract from Addiont HT INFO IE */ |
396 | u8 MaxRAmpduFactor:2; | 396 | u8 MaxRAmpduFactor:2; |
397 | u8 MpduDensity:3; | 397 | u8 MpduDensity:3; |
398 | u8 ExtChanOffset:2; /* Please note the difference with following u8 NewExtChannelOffset; from 802.11n */ | 398 | u8 ExtChanOffset:2; /* Please note the difference with following u8 NewExtChannelOffset; from 802.11n */ |
@@ -410,7 +410,7 @@ struct rt_ht_capability { | |||
410 | u8 BSSCoexist2040; | 410 | u8 BSSCoexist2040; |
411 | }; | 411 | }; |
412 | 412 | ||
413 | /* field in Addtional HT Information IE . */ | 413 | /* field in Additional HT Information IE . */ |
414 | struct PACKED rt_add_htinfo { | 414 | struct PACKED rt_add_htinfo { |
415 | u8 ExtChanOffset:2; | 415 | u8 ExtChanOffset:2; |
416 | u8 RecomWidth:1; | 416 | u8 RecomWidth:1; |
@@ -857,7 +857,7 @@ struct rt_state_machine { | |||
857 | }; | 857 | }; |
858 | 858 | ||
859 | /* MLME AUX data structure that holds temporarliy settings during a connection attempt. */ | 859 | /* MLME AUX data structure that holds temporarliy settings during a connection attempt. */ |
860 | /* Once this attemp succeeds, all settings will be copy to pAd->StaActive. */ | 860 | /* Once this attempt succeeds, all settings will be copy to pAd->StaActive. */ |
861 | /* A connection attempt (user set OID, roaming, CCX fast roaming,..) consists of */ | 861 | /* A connection attempt (user set OID, roaming, CCX fast roaming,..) consists of */ |
862 | /* several steps (JOIN, AUTH, ASSOC or REASSOC) and may fail at any step. We purposely */ | 862 | /* several steps (JOIN, AUTH, ASSOC or REASSOC) and may fail at any step. We purposely */ |
863 | /* separate this under-trial settings away from pAd->StaActive so that once */ | 863 | /* separate this under-trial settings away from pAd->StaActive so that once */ |
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index e5b042712430..1583347fcd52 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c | |||
@@ -283,7 +283,7 @@ BOOLEAN OS_Need_Clone_Packet(void) | |||
283 | Arguments: | 283 | Arguments: |
284 | pAd Pointer to our adapter | 284 | pAd Pointer to our adapter |
285 | pInsAMSDUHdr EWC A-MSDU format has extra 14-bytes header. if TRUE, insert this 14-byte hdr in front of MSDU. | 285 | pInsAMSDUHdr EWC A-MSDU format has extra 14-bytes header. if TRUE, insert this 14-byte hdr in front of MSDU. |
286 | *pSrcTotalLen return total packet length. This lenght is calculated with 802.3 format packet. | 286 | *pSrcTotalLen return total packet length. This length is calculated with 802.3 format packet. |
287 | 287 | ||
288 | Return Value: | 288 | Return Value: |
289 | NDIS_STATUS_SUCCESS | 289 | NDIS_STATUS_SUCCESS |
diff --git a/drivers/staging/rt2860/rt_pci_rbus.c b/drivers/staging/rt2860/rt_pci_rbus.c index e5fb67cd9a68..f80ab4e6a0ac 100644 --- a/drivers/staging/rt2860/rt_pci_rbus.c +++ b/drivers/staging/rt2860/rt_pci_rbus.c | |||
@@ -619,7 +619,7 @@ IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance) | |||
619 | Or kernel will panic after ifconfig ra0 down sometimes */ | 619 | Or kernel will panic after ifconfig ra0 down sometimes */ |
620 | 620 | ||
621 | /* */ | 621 | /* */ |
622 | /* Inital the Interrupt source. */ | 622 | /* Initial the Interrupt source. */ |
623 | /* */ | 623 | /* */ |
624 | IntSource.word = 0x00000000L; | 624 | IntSource.word = 0x00000000L; |
625 | /* McuIntSource.word = 0x00000000L; */ | 625 | /* McuIntSource.word = 0x00000000L; */ |
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h index d16b06a6e2ac..3c31340c946a 100644 --- a/drivers/staging/rt2860/rtmp.h +++ b/drivers/staging/rt2860/rtmp.h | |||
@@ -756,7 +756,7 @@ struct rt_tkip_key_info { | |||
756 | /* */ | 756 | /* */ |
757 | struct rt_private { | 757 | struct rt_private { |
758 | u32 SystemResetCnt; /* System reset counter */ | 758 | u32 SystemResetCnt; /* System reset counter */ |
759 | u32 TxRingFullCnt; /* Tx ring full occurrance number */ | 759 | u32 TxRingFullCnt; /* Tx ring full occurrence number */ |
760 | u32 PhyRxErrCnt; /* PHY Rx error count, for debug purpose, might move to global counter */ | 760 | u32 PhyRxErrCnt; /* PHY Rx error count, for debug purpose, might move to global counter */ |
761 | /* Variables for WEP encryption / decryption in rtmp_wep.c */ | 761 | /* Variables for WEP encryption / decryption in rtmp_wep.c */ |
762 | u32 FCSCRC32; | 762 | u32 FCSCRC32; |
@@ -925,7 +925,7 @@ struct rt_mlme { | |||
925 | **************************************************************************/ | 925 | **************************************************************************/ |
926 | struct reordering_mpdu { | 926 | struct reordering_mpdu { |
927 | struct reordering_mpdu *next; | 927 | struct reordering_mpdu *next; |
928 | void *pPacket; /* coverted to 802.3 frame */ | 928 | void *pPacket; /* converted to 802.3 frame */ |
929 | int Sequence; /* sequence number of MPDU */ | 929 | int Sequence; /* sequence number of MPDU */ |
930 | BOOLEAN bAMSDU; | 930 | BOOLEAN bAMSDU; |
931 | }; | 931 | }; |
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c index 5717e12a9544..49b1013e7a03 100644 --- a/drivers/staging/rt2860/sta_ioctl.c +++ b/drivers/staging/rt2860/sta_ioctl.c | |||
@@ -2460,7 +2460,7 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev, | |||
2460 | } | 2460 | } |
2461 | } | 2461 | } |
2462 | 2462 | ||
2463 | { /* determine this ioctl command is comming from which interface. */ | 2463 | { /* determine this ioctl command is coming from which interface. */ |
2464 | pObj->ioctl_if_type = INT_MAIN; | 2464 | pObj->ioctl_if_type = INT_MAIN; |
2465 | pObj->ioctl_if = MAIN_MBSSID; | 2465 | pObj->ioctl_if = MAIN_MBSSID; |
2466 | } | 2466 | } |
diff --git a/drivers/staging/rt2870/common/rtusb_bulk.c b/drivers/staging/rt2870/common/rtusb_bulk.c index d2746f8732e6..679b802d2169 100644 --- a/drivers/staging/rt2870/common/rtusb_bulk.c +++ b/drivers/staging/rt2870/common/rtusb_bulk.c | |||
@@ -298,7 +298,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd, | |||
298 | /*|| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0)) */ | 298 | /*|| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0)) */ |
299 | ) { | 299 | ) { |
300 | /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */ | 300 | /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */ |
301 | /* For performence in b/g mode, now just check for USB 1.1 and didn't care about the APMDU or not! 2008/06/04. */ | 301 | /* For performance in b/g mode, now just check for USB 1.1 and didn't care about the APMDU or not! 2008/06/04. */ |
302 | pHTTXContext->ENextBulkOutPosition = | 302 | pHTTXContext->ENextBulkOutPosition = |
303 | TmpBulkEndPos; | 303 | TmpBulkEndPos; |
304 | break; | 304 | break; |
@@ -311,7 +311,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd, | |||
311 | TmpBulkEndPos; | 311 | TmpBulkEndPos; |
312 | break; | 312 | break; |
313 | } else if (((pAd->BulkOutMaxPacketSize < 512) && ((ThisBulkSize & 0xfffff800) != 0)) /*|| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0)) */) { /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */ | 313 | } else if (((pAd->BulkOutMaxPacketSize < 512) && ((ThisBulkSize & 0xfffff800) != 0)) /*|| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0)) */) { /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */ |
314 | /* For performence in b/g mode, now just check for USB 1.1 and didn't care about the APMDU or not! 2008/06/04. */ | 314 | /* For performance in b/g mode, now just check for USB 1.1 and didn't care about the APMDU or not! 2008/06/04. */ |
315 | pHTTXContext->ENextBulkOutPosition = | 315 | pHTTXContext->ENextBulkOutPosition = |
316 | TmpBulkEndPos; | 316 | TmpBulkEndPos; |
317 | break; | 317 | break; |
@@ -1016,7 +1016,7 @@ void RTUSBKickBulkOut(struct rt_rtmp_adapter *pAd) | |||
1016 | RTUSBBulkOutNullFrame(pAd); | 1016 | RTUSBBulkOutNullFrame(pAd); |
1017 | } | 1017 | } |
1018 | } | 1018 | } |
1019 | /* 8. No data avaliable */ | 1019 | /* 8. No data available */ |
1020 | else | 1020 | else |
1021 | ; | 1021 | ; |
1022 | } | 1022 | } |
diff --git a/drivers/staging/rt2870/common/rtusb_data.c b/drivers/staging/rt2870/common/rtusb_data.c index 69368862217c..5b72bcdaa78f 100644 --- a/drivers/staging/rt2870/common/rtusb_data.c +++ b/drivers/staging/rt2870/common/rtusb_data.c | |||
@@ -71,7 +71,7 @@ void REPORT_AMSDU_FRAMES_TO_LLC(struct rt_rtmp_adapter *pAd, | |||
71 | 71 | ||
72 | Routine Description: | 72 | Routine Description: |
73 | This subroutine will scan through releative ring descriptor to find | 73 | This subroutine will scan through releative ring descriptor to find |
74 | out avaliable free ring descriptor and compare with request size. | 74 | out available free ring descriptor and compare with request size. |
75 | 75 | ||
76 | Arguments: | 76 | Arguments: |
77 | pAd Pointer to our adapter | 77 | pAd Pointer to our adapter |
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h index dc608c70deb1..16aa6a8952fd 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h | |||
@@ -1099,7 +1099,7 @@ struct ieee80211_device { | |||
1099 | * not set. As some cards may have different HW queues that | 1099 | * not set. As some cards may have different HW queues that |
1100 | * one might want to use for data and management frames | 1100 | * one might want to use for data and management frames |
1101 | * the option to have two callbacks might be useful. | 1101 | * the option to have two callbacks might be useful. |
1102 | * This fucntion can't sleep. | 1102 | * This function can't sleep. |
1103 | */ | 1103 | */ |
1104 | int (*softmac_hard_start_xmit)(struct sk_buff *skb, | 1104 | int (*softmac_hard_start_xmit)(struct sk_buff *skb, |
1105 | struct net_device *dev); | 1105 | struct net_device *dev); |
@@ -1138,9 +1138,9 @@ struct ieee80211_device { | |||
1138 | * it is called in a work_queue when swithcing to ad-hoc mode | 1138 | * it is called in a work_queue when swithcing to ad-hoc mode |
1139 | * or in behalf of iwlist scan when the card is associated | 1139 | * or in behalf of iwlist scan when the card is associated |
1140 | * and root user ask for a scan. | 1140 | * and root user ask for a scan. |
1141 | * the fucntion stop_scan should stop both the syncro and | 1141 | * the function stop_scan should stop both the syncro and |
1142 | * background scanning and can sleep. | 1142 | * background scanning and can sleep. |
1143 | * The fucntion start_scan should initiate the background | 1143 | * The function start_scan should initiate the background |
1144 | * scanning and can't sleep. | 1144 | * scanning and can't sleep. |
1145 | */ | 1145 | */ |
1146 | void (*scan_syncro)(struct net_device *dev); | 1146 | void (*scan_syncro)(struct net_device *dev); |
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index 771e0196842e..736a1404f287 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | |||
@@ -1954,7 +1954,7 @@ associate_complete: | |||
1954 | 1954 | ||
1955 | 1955 | ||
1956 | 1956 | ||
1957 | /* following are for a simplier TX queue management. | 1957 | /* following are for a simpler TX queue management. |
1958 | * Instead of using netif_[stop/wake]_queue the driver | 1958 | * Instead of using netif_[stop/wake]_queue the driver |
1959 | * will uses these two function (plus a reset one), that | 1959 | * will uses these two function (plus a reset one), that |
1960 | * will internally uses the kernel netif_* and takes | 1960 | * will internally uses the kernel netif_* and takes |
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 70ab0084e5f5..2155a771c339 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c | |||
@@ -1591,7 +1591,7 @@ void rtl8180_rx(struct net_device *dev) | |||
1591 | priv->RSSI = RSSI; | 1591 | priv->RSSI = RSSI; |
1592 | /* SQ translation formula is provided by SD3 DZ. 2006.06.27 */ | 1592 | /* SQ translation formula is provided by SD3 DZ. 2006.06.27 */ |
1593 | if (quality >= 127) | 1593 | if (quality >= 127) |
1594 | quality = 1; /*0; */ /* 0 will cause epc to show signal zero , walk aroud now; */ | 1594 | quality = 1; /*0; */ /* 0 will cause epc to show signal zero , walk around now; */ |
1595 | else if (quality < 27) | 1595 | else if (quality < 27) |
1596 | quality = 100; | 1596 | quality = 100; |
1597 | else | 1597 | else |
@@ -3883,7 +3883,7 @@ void rtl8180_tx_isr(struct net_device *dev, int pri, short error) | |||
3883 | * If the packet previous of the nic pointer has been | 3883 | * If the packet previous of the nic pointer has been |
3884 | * processed this doesn't matter: it will be checked | 3884 | * processed this doesn't matter: it will be checked |
3885 | * here at the next round. Anyway if no more packet are | 3885 | * here at the next round. Anyway if no more packet are |
3886 | * TXed no memory leak occour at all. | 3886 | * TXed no memory leak occur at all. |
3887 | */ | 3887 | */ |
3888 | 3888 | ||
3889 | switch (pri) { | 3889 | switch (pri) { |
diff --git a/drivers/staging/rtl8187se/r8180_dm.c b/drivers/staging/rtl8187se/r8180_dm.c index fc4907839c58..261085d4b74a 100644 --- a/drivers/staging/rtl8187se/r8180_dm.c +++ b/drivers/staging/rtl8187se/r8180_dm.c | |||
@@ -123,7 +123,7 @@ DoTxHighPower( | |||
123 | // | 123 | // |
124 | // Description: | 124 | // Description: |
125 | // Callback function of UpdateTxPowerWorkItem. | 125 | // Callback function of UpdateTxPowerWorkItem. |
126 | // Because of some event happend, e.g. CCX TPC, High Power Mechanism, | 126 | // Because of some event happened, e.g. CCX TPC, High Power Mechanism, |
127 | // We update Tx power of current channel again. | 127 | // We update Tx power of current channel again. |
128 | // | 128 | // |
129 | void rtl8180_tx_pw_wq (struct work_struct *work) | 129 | void rtl8180_tx_pw_wq (struct work_struct *work) |
@@ -984,7 +984,7 @@ StaRateAdaptive87SE( | |||
984 | { | 984 | { |
985 | priv->TryupingCount = 0; | 985 | priv->TryupingCount = 0; |
986 | // | 986 | // |
987 | // When transfering from CCK to OFDM, DIG is an important issue. | 987 | // When transferring from CCK to OFDM, DIG is an important issue. |
988 | // | 988 | // |
989 | if(priv->CurrentOperaRate == 22) | 989 | if(priv->CurrentOperaRate == 22) |
990 | bUpdateInitialGain = true; | 990 | bUpdateInitialGain = true; |
diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c index 2a2afd51cf42..3f09f76080af 100644 --- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c +++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c | |||
@@ -378,7 +378,7 @@ static u32 read_rtl8225(struct net_device *dev, u8 adr) | |||
378 | mask = (low2high) ? 0x01 : (((u32)0x01) << (12-1)); | 378 | mask = (low2high) ? 0x01 : (((u32)0x01) << (12-1)); |
379 | 379 | ||
380 | /* | 380 | /* |
381 | * We must set data pin to HW controled, otherwise RF can't driver it | 381 | * We must set data pin to HW controlled, otherwise RF can't driver it |
382 | * and value RF register won't be able to read back properly. | 382 | * and value RF register won't be able to read back properly. |
383 | */ | 383 | */ |
384 | write_nic_word(dev, RFPinsEnable, (oval2 & (~0x01))); | 384 | write_nic_word(dev, RFPinsEnable, (oval2 & (~0x01))); |
diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c index 3bdf9b31cc4e..4b0b830f9ab6 100644 --- a/drivers/staging/rtl8187se/r8185b_init.c +++ b/drivers/staging/rtl8187se/r8185b_init.c | |||
@@ -1273,7 +1273,7 @@ MgntDisconnectIBSS( | |||
1273 | /* | 1273 | /* |
1274 | Stop Beacon. | 1274 | Stop Beacon. |
1275 | 1275 | ||
1276 | Vista add a Adhoc profile, HW radio off untill OID_DOT11_RESET_REQUEST | 1276 | Vista add a Adhoc profile, HW radio off until OID_DOT11_RESET_REQUEST |
1277 | Driver would set MSR=NO_LINK, then HW Radio ON, MgntQueue Stuck. | 1277 | Driver would set MSR=NO_LINK, then HW Radio ON, MgntQueue Stuck. |
1278 | Because Bcn DMA isn't complete, mgnt queue would stuck until Bcn packet send. | 1278 | Because Bcn DMA isn't complete, mgnt queue would stuck until Bcn packet send. |
1279 | 1279 | ||
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h index 3ca388152616..dbe21ab0dbf7 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h | |||
@@ -1967,7 +1967,7 @@ struct ieee80211_device { | |||
1967 | u16 prev_seq_ctl; /* used to drop duplicate frames */ | 1967 | u16 prev_seq_ctl; /* used to drop duplicate frames */ |
1968 | 1968 | ||
1969 | /* map of allowed channels. 0 is dummy */ | 1969 | /* map of allowed channels. 0 is dummy */ |
1970 | // FIXME: remeber to default to a basic channel plan depending of the PHY type | 1970 | // FIXME: remember to default to a basic channel plan depending of the PHY type |
1971 | #ifdef ENABLE_DOT11D | 1971 | #ifdef ENABLE_DOT11D |
1972 | void* pDot11dInfo; | 1972 | void* pDot11dInfo; |
1973 | bool bGlobalDomain; | 1973 | bool bGlobalDomain; |
@@ -2121,7 +2121,7 @@ struct ieee80211_device { | |||
2121 | * not set. As some cards may have different HW queues that | 2121 | * not set. As some cards may have different HW queues that |
2122 | * one might want to use for data and management frames | 2122 | * one might want to use for data and management frames |
2123 | * the option to have two callbacks might be useful. | 2123 | * the option to have two callbacks might be useful. |
2124 | * This fucntion can't sleep. | 2124 | * This function can't sleep. |
2125 | */ | 2125 | */ |
2126 | int (*softmac_hard_start_xmit)(struct sk_buff *skb, | 2126 | int (*softmac_hard_start_xmit)(struct sk_buff *skb, |
2127 | struct ieee80211_device *ieee80211); | 2127 | struct ieee80211_device *ieee80211); |
@@ -2160,9 +2160,9 @@ struct ieee80211_device { | |||
2160 | * it is called in a work_queue when swithcing to ad-hoc mode | 2160 | * it is called in a work_queue when swithcing to ad-hoc mode |
2161 | * or in behalf of iwlist scan when the card is associated | 2161 | * or in behalf of iwlist scan when the card is associated |
2162 | * and root user ask for a scan. | 2162 | * and root user ask for a scan. |
2163 | * the fucntion stop_scan should stop both the syncro and | 2163 | * the function stop_scan should stop both the syncro and |
2164 | * background scanning and can sleep. | 2164 | * background scanning and can sleep. |
2165 | * The fucntion start_scan should initiate the background | 2165 | * The function start_scan should initiate the background |
2166 | * scanning and can't sleep. | 2166 | * scanning and can't sleep. |
2167 | */ | 2167 | */ |
2168 | void (*scan_syncro)(struct ieee80211_device *ieee80211); | 2168 | void (*scan_syncro)(struct ieee80211_device *ieee80211); |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c index add015ebba1c..ed5a38023094 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | |||
@@ -1426,7 +1426,7 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
1426 | static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 }; | 1426 | static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 }; |
1427 | 1427 | ||
1428 | /* | 1428 | /* |
1429 | * Make ther structure we read from the beacon packet has | 1429 | * Make the structure we read from the beacon packet to have |
1430 | * the right values | 1430 | * the right values |
1431 | */ | 1431 | */ |
1432 | static int ieee80211_verify_qos_info(struct ieee80211_qos_information_element | 1432 | static int ieee80211_verify_qos_info(struct ieee80211_qos_information_element |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index f6922d40a88a..7d4cba3a7c12 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | |||
@@ -2023,7 +2023,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
2023 | return 1; | 2023 | return 1; |
2024 | } | 2024 | } |
2025 | else | 2025 | else |
2026 | { //filling the PeerHTCap. //maybe not neccesary as we can get its info from current_network. | 2026 | { //filling the PeerHTCap. //maybe not necessary as we can get its info from current_network. |
2027 | memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen); | 2027 | memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen); |
2028 | memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen); | 2028 | memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen); |
2029 | } | 2029 | } |
@@ -2163,7 +2163,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
2163 | return 0; | 2163 | return 0; |
2164 | } | 2164 | } |
2165 | 2165 | ||
2166 | /* following are for a simplier TX queue management. | 2166 | /* following are for a simpler TX queue management. |
2167 | * Instead of using netif_[stop/wake]_queue the driver | 2167 | * Instead of using netif_[stop/wake]_queue the driver |
2168 | * will uses these two function (plus a reset one), that | 2168 | * will uses these two function (plus a reset one), that |
2169 | * will internally uses the kernel netif_* and takes | 2169 | * will internally uses the kernel netif_* and takes |
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h index f968817d073c..56a120cf6291 100644 --- a/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | |||
@@ -64,7 +64,7 @@ typedef enum _HT_CHANNEL_WIDTH{ | |||
64 | }HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; | 64 | }HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; |
65 | 65 | ||
66 | // | 66 | // |
67 | // Represent Extention Channel Offset in HT Capabilities | 67 | // Represent Extension Channel Offset in HT Capabilities |
68 | // This is available only in 40Mhz mode. | 68 | // This is available only in 40Mhz mode. |
69 | // | 69 | // |
70 | typedef enum _HT_EXTCHNL_OFFSET{ | 70 | typedef enum _HT_EXTCHNL_OFFSET{ |
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c index a2a4fe9dd9da..f7a9da3ec829 100644 --- a/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c | |||
@@ -459,7 +459,7 @@ u8 HTIOTActIsForcedCTS2Self(struct ieee80211_device *ieee, struct ieee80211_netw | |||
459 | /** | 459 | /** |
460 | * Function: HTIOTActIsDisableMCS15 | 460 | * Function: HTIOTActIsDisableMCS15 |
461 | * | 461 | * |
462 | * Overview: Check whether driver should declare capability of receving MCS15 | 462 | * Overview: Check whether driver should declare capability of receiving MCS15 |
463 | * | 463 | * |
464 | * Input: | 464 | * Input: |
465 | * PADAPTER Adapter, | 465 | * PADAPTER Adapter, |
@@ -496,7 +496,7 @@ bool HTIOTActIsDisableMCS15(struct ieee80211_device* ieee) | |||
496 | /** | 496 | /** |
497 | * Function: HTIOTActIsDisableMCSTwoSpatialStream | 497 | * Function: HTIOTActIsDisableMCSTwoSpatialStream |
498 | * | 498 | * |
499 | * Overview: Check whether driver should declare capability of receving All 2 ss packets | 499 | * Overview: Check whether driver should declare capability of receiving All 2 ss packets |
500 | * | 500 | * |
501 | * Input: | 501 | * Input: |
502 | * PADAPTER Adapter, | 502 | * PADAPTER Adapter, |
@@ -1681,7 +1681,7 @@ void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidt | |||
1681 | //if in half N mode, set to 20M bandwidth please 09.08.2008 WB. | 1681 | //if in half N mode, set to 20M bandwidth please 09.08.2008 WB. |
1682 | if (Bandwidth==HT_CHANNEL_WIDTH_20_40 && (!ieee->GetHalfNmodeSupportByAPsHandler(ieee))) | 1682 | if (Bandwidth==HT_CHANNEL_WIDTH_20_40 && (!ieee->GetHalfNmodeSupportByAPsHandler(ieee))) |
1683 | { | 1683 | { |
1684 | // Handle Illegal extention channel offset!! | 1684 | // Handle Illegal extension channel offset!! |
1685 | if(ieee->current_network.channel<2 && Offset==HT_EXTCHNL_OFFSET_LOWER) | 1685 | if(ieee->current_network.channel<2 && Offset==HT_EXTCHNL_OFFSET_LOWER) |
1686 | Offset = HT_EXTCHNL_OFFSET_NO_EXT; | 1686 | Offset = HT_EXTCHNL_OFFSET_NO_EXT; |
1687 | if(Offset==HT_EXTCHNL_OFFSET_UPPER || Offset==HT_EXTCHNL_OFFSET_LOWER) { | 1687 | if(Offset==HT_EXTCHNL_OFFSET_UPPER || Offset==HT_EXTCHNL_OFFSET_LOWER) { |
@@ -1698,7 +1698,7 @@ void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidt | |||
1698 | 1698 | ||
1699 | pHTInfo->bSwBwInProgress = true; | 1699 | pHTInfo->bSwBwInProgress = true; |
1700 | 1700 | ||
1701 | // TODO: 2007.7.13 by Emily Wait 2000ms in order to garantee that switching | 1701 | // TODO: 2007.7.13 by Emily Wait 2000ms in order to guarantee that switching |
1702 | // bandwidth is executed after scan is finished. It is a temporal solution | 1702 | // bandwidth is executed after scan is finished. It is a temporal solution |
1703 | // because software should ganrantee the last operation of switching bandwidth | 1703 | // because software should ganrantee the last operation of switching bandwidth |
1704 | // is executed properlly. | 1704 | // is executed properlly. |
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h index baaac2149de1..e7e26fd96395 100644 --- a/drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h | |||
@@ -44,7 +44,7 @@ typedef struct _RX_TS_RECORD { | |||
44 | u16 RxTimeoutIndicateSeq; | 44 | u16 RxTimeoutIndicateSeq; |
45 | struct list_head RxPendingPktList; | 45 | struct list_head RxPendingPktList; |
46 | struct timer_list RxPktPendingTimer; | 46 | struct timer_list RxPktPendingTimer; |
47 | BA_RECORD RxAdmittedBARecord; // For BA Recepient | 47 | BA_RECORD RxAdmittedBARecord; // For BA Recipient |
48 | u16 RxLastSeqNum; | 48 | u16 RxLastSeqNum; |
49 | u8 RxLastFragNum; | 49 | u8 RxLastFragNum; |
50 | u8 num; | 50 | u8 num; |
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c index 29eecf0ab769..ad6872dcf1c2 100644 --- a/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c | |||
@@ -135,7 +135,7 @@ void ResetRxTsEntry(PRX_TS_RECORD pTS) | |||
135 | ResetTsCommonInfo(&pTS->TsCommonInfo); | 135 | ResetTsCommonInfo(&pTS->TsCommonInfo); |
136 | pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!! | 136 | pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!! |
137 | pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!! | 137 | pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!! |
138 | ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recepient | 138 | ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recipient |
139 | } | 139 | } |
140 | 140 | ||
141 | void TSInitialize(struct ieee80211_device *ieee) | 141 | void TSInitialize(struct ieee80211_device *ieee) |
diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8192e/r819xE_phy.c index dfa4e112ef46..9e7828ef1cbe 100644 --- a/drivers/staging/rtl8192e/r819xE_phy.c +++ b/drivers/staging/rtl8192e/r819xE_phy.c | |||
@@ -2032,13 +2032,13 @@ void rtl8192_SetBWModeWorkItem(struct r8192_priv *priv) | |||
2032 | { | 2032 | { |
2033 | case HT_CHANNEL_WIDTH_20: | 2033 | case HT_CHANNEL_WIDTH_20: |
2034 | regBwOpMode |= BW_OPMODE_20MHZ; | 2034 | regBwOpMode |= BW_OPMODE_20MHZ; |
2035 | // 2007/02/07 Mark by Emily becasue we have not verify whether this register works | 2035 | // 2007/02/07 Mark by Emily because we have not verify whether this register works |
2036 | write_nic_byte(priv, BW_OPMODE, regBwOpMode); | 2036 | write_nic_byte(priv, BW_OPMODE, regBwOpMode); |
2037 | break; | 2037 | break; |
2038 | 2038 | ||
2039 | case HT_CHANNEL_WIDTH_20_40: | 2039 | case HT_CHANNEL_WIDTH_20_40: |
2040 | regBwOpMode &= ~BW_OPMODE_20MHZ; | 2040 | regBwOpMode &= ~BW_OPMODE_20MHZ; |
2041 | // 2007/02/07 Mark by Emily becasue we have not verify whether this register works | 2041 | // 2007/02/07 Mark by Emily because we have not verify whether this register works |
2042 | write_nic_byte(priv, BW_OPMODE, regBwOpMode); | 2042 | write_nic_byte(priv, BW_OPMODE, regBwOpMode); |
2043 | break; | 2043 | break; |
2044 | 2044 | ||
@@ -2116,7 +2116,7 @@ void rtl8192_SetBWModeWorkItem(struct r8192_priv *priv) | |||
2116 | } | 2116 | } |
2117 | 2117 | ||
2118 | /****************************************************************************** | 2118 | /****************************************************************************** |
2119 | *function: This function schedules bandwith switch work. | 2119 | *function: This function schedules bandwidth switch work. |
2120 | * input: struct net_device *dev | 2120 | * input: struct net_device *dev |
2121 | * HT_CHANNEL_WIDTH Bandwidth //20M or 40M | 2121 | * HT_CHANNEL_WIDTH Bandwidth //20M or 40M |
2122 | * HT_EXTCHNL_OFFSET Offset //Upper, Lower, or Don't care | 2122 | * HT_EXTCHNL_OFFSET Offset //Upper, Lower, or Don't care |
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index c0b844d75c0d..e716f7b1144f 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h | |||
@@ -1965,7 +1965,7 @@ struct ieee80211_device { | |||
1965 | u16 prev_seq_ctl; /* used to drop duplicate frames */ | 1965 | u16 prev_seq_ctl; /* used to drop duplicate frames */ |
1966 | 1966 | ||
1967 | /* map of allowed channels. 0 is dummy */ | 1967 | /* map of allowed channels. 0 is dummy */ |
1968 | // FIXME: remeber to default to a basic channel plan depending of the PHY type | 1968 | // FIXME: remember to default to a basic channel plan depending of the PHY type |
1969 | void* pDot11dInfo; | 1969 | void* pDot11dInfo; |
1970 | bool bGlobalDomain; | 1970 | bool bGlobalDomain; |
1971 | int rate; /* current rate */ | 1971 | int rate; /* current rate */ |
@@ -2119,7 +2119,7 @@ struct ieee80211_device { | |||
2119 | * not set. As some cards may have different HW queues that | 2119 | * not set. As some cards may have different HW queues that |
2120 | * one might want to use for data and management frames | 2120 | * one might want to use for data and management frames |
2121 | * the option to have two callbacks might be useful. | 2121 | * the option to have two callbacks might be useful. |
2122 | * This fucntion can't sleep. | 2122 | * This function can't sleep. |
2123 | */ | 2123 | */ |
2124 | int (*softmac_hard_start_xmit)(struct sk_buff *skb, | 2124 | int (*softmac_hard_start_xmit)(struct sk_buff *skb, |
2125 | struct net_device *dev); | 2125 | struct net_device *dev); |
@@ -2158,9 +2158,9 @@ struct ieee80211_device { | |||
2158 | * it is called in a work_queue when swithcing to ad-hoc mode | 2158 | * it is called in a work_queue when swithcing to ad-hoc mode |
2159 | * or in behalf of iwlist scan when the card is associated | 2159 | * or in behalf of iwlist scan when the card is associated |
2160 | * and root user ask for a scan. | 2160 | * and root user ask for a scan. |
2161 | * the fucntion stop_scan should stop both the syncro and | 2161 | * the function stop_scan should stop both the syncro and |
2162 | * background scanning and can sleep. | 2162 | * background scanning and can sleep. |
2163 | * The fucntion start_scan should initiate the background | 2163 | * The function start_scan should initiate the background |
2164 | * scanning and can't sleep. | 2164 | * scanning and can't sleep. |
2165 | */ | 2165 | */ |
2166 | void (*scan_syncro)(struct net_device *dev); | 2166 | void (*scan_syncro)(struct net_device *dev); |
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c index 498b520efcf4..a414303aef54 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | |||
@@ -1399,7 +1399,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
1399 | static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 }; | 1399 | static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 }; |
1400 | 1400 | ||
1401 | /* | 1401 | /* |
1402 | * Make ther structure we read from the beacon packet has | 1402 | * Make the structure we read from the beacon packet to have |
1403 | * the right values | 1403 | * the right values |
1404 | */ | 1404 | */ |
1405 | static int ieee80211_verify_qos_info(struct ieee80211_qos_information_element | 1405 | static int ieee80211_verify_qos_info(struct ieee80211_qos_information_element |
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index 4992d630f984..4ec0a6520ddc 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | |||
@@ -1973,7 +1973,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
1973 | return 1; | 1973 | return 1; |
1974 | } | 1974 | } |
1975 | else | 1975 | else |
1976 | { //filling the PeerHTCap. //maybe not neccesary as we can get its info from current_network. | 1976 | { //filling the PeerHTCap. //maybe not necessary as we can get its info from current_network. |
1977 | memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen); | 1977 | memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen); |
1978 | memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen); | 1978 | memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen); |
1979 | } | 1979 | } |
@@ -2113,7 +2113,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
2113 | return 0; | 2113 | return 0; |
2114 | } | 2114 | } |
2115 | 2115 | ||
2116 | /* following are for a simplier TX queue management. | 2116 | /* following are for a simpler TX queue management. |
2117 | * Instead of using netif_[stop/wake]_queue the driver | 2117 | * Instead of using netif_[stop/wake]_queue the driver |
2118 | * will uses these two function (plus a reset one), that | 2118 | * will uses these two function (plus a reset one), that |
2119 | * will internally uses the kernel netif_* and takes | 2119 | * will internally uses the kernel netif_* and takes |
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h index cde603f67f43..0b1a1fc09391 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | |||
@@ -64,7 +64,7 @@ typedef enum _HT_CHANNEL_WIDTH{ | |||
64 | }HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; | 64 | }HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; |
65 | 65 | ||
66 | // | 66 | // |
67 | // Represent Extention Channel Offset in HT Capabilities | 67 | // Represent Extension Channel Offset in HT Capabilities |
68 | // This is available only in 40Mhz mode. | 68 | // This is available only in 40Mhz mode. |
69 | // | 69 | // |
70 | typedef enum _HT_EXTCHNL_OFFSET{ | 70 | typedef enum _HT_EXTCHNL_OFFSET{ |
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c index 50f4f5943e75..e88a839b2a91 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | |||
@@ -423,7 +423,7 @@ u8 HTIOTActIsDisableMCS14(struct ieee80211_device* ieee, u8* PeerMacAddr) | |||
423 | /** | 423 | /** |
424 | * Function: HTIOTActIsDisableMCS15 | 424 | * Function: HTIOTActIsDisableMCS15 |
425 | * | 425 | * |
426 | * Overview: Check whether driver should declare capability of receving MCS15 | 426 | * Overview: Check whether driver should declare capability of receiving MCS15 |
427 | * | 427 | * |
428 | * Input: | 428 | * Input: |
429 | * PADAPTER Adapter, | 429 | * PADAPTER Adapter, |
@@ -460,7 +460,7 @@ bool HTIOTActIsDisableMCS15(struct ieee80211_device* ieee) | |||
460 | /** | 460 | /** |
461 | * Function: HTIOTActIsDisableMCSTwoSpatialStream | 461 | * Function: HTIOTActIsDisableMCSTwoSpatialStream |
462 | * | 462 | * |
463 | * Overview: Check whether driver should declare capability of receving All 2 ss packets | 463 | * Overview: Check whether driver should declare capability of receiving All 2 ss packets |
464 | * | 464 | * |
465 | * Input: | 465 | * Input: |
466 | * PADAPTER Adapter, | 466 | * PADAPTER Adapter, |
@@ -1409,7 +1409,7 @@ void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidt | |||
1409 | //if in half N mode, set to 20M bandwidth please 09.08.2008 WB. | 1409 | //if in half N mode, set to 20M bandwidth please 09.08.2008 WB. |
1410 | if(Bandwidth==HT_CHANNEL_WIDTH_20_40 && (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))) | 1410 | if(Bandwidth==HT_CHANNEL_WIDTH_20_40 && (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))) |
1411 | { | 1411 | { |
1412 | // Handle Illegal extention channel offset!! | 1412 | // Handle Illegal extension channel offset!! |
1413 | if(ieee->current_network.channel<2 && Offset==HT_EXTCHNL_OFFSET_LOWER) | 1413 | if(ieee->current_network.channel<2 && Offset==HT_EXTCHNL_OFFSET_LOWER) |
1414 | Offset = HT_EXTCHNL_OFFSET_NO_EXT; | 1414 | Offset = HT_EXTCHNL_OFFSET_NO_EXT; |
1415 | if(Offset==HT_EXTCHNL_OFFSET_UPPER || Offset==HT_EXTCHNL_OFFSET_LOWER) { | 1415 | if(Offset==HT_EXTCHNL_OFFSET_UPPER || Offset==HT_EXTCHNL_OFFSET_LOWER) { |
@@ -1426,7 +1426,7 @@ void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidt | |||
1426 | 1426 | ||
1427 | pHTInfo->bSwBwInProgress = true; | 1427 | pHTInfo->bSwBwInProgress = true; |
1428 | 1428 | ||
1429 | // TODO: 2007.7.13 by Emily Wait 2000ms in order to garantee that switching | 1429 | // TODO: 2007.7.13 by Emily Wait 2000ms in order to guarantee that switching |
1430 | // bandwidth is executed after scan is finished. It is a temporal solution | 1430 | // bandwidth is executed after scan is finished. It is a temporal solution |
1431 | // because software should ganrantee the last operation of switching bandwidth | 1431 | // because software should ganrantee the last operation of switching bandwidth |
1432 | // is executed properlly. | 1432 | // is executed properlly. |
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h index baaac2149de1..e7e26fd96395 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | |||
@@ -44,7 +44,7 @@ typedef struct _RX_TS_RECORD { | |||
44 | u16 RxTimeoutIndicateSeq; | 44 | u16 RxTimeoutIndicateSeq; |
45 | struct list_head RxPendingPktList; | 45 | struct list_head RxPendingPktList; |
46 | struct timer_list RxPktPendingTimer; | 46 | struct timer_list RxPktPendingTimer; |
47 | BA_RECORD RxAdmittedBARecord; // For BA Recepient | 47 | BA_RECORD RxAdmittedBARecord; // For BA Recipient |
48 | u16 RxLastSeqNum; | 48 | u16 RxLastSeqNum; |
49 | u8 RxLastFragNum; | 49 | u8 RxLastFragNum; |
50 | u8 num; | 50 | u8 num; |
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c index c3fcaae0750d..957ce4ef48b5 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | |||
@@ -135,7 +135,7 @@ void ResetRxTsEntry(PRX_TS_RECORD pTS) | |||
135 | ResetTsCommonInfo(&pTS->TsCommonInfo); | 135 | ResetTsCommonInfo(&pTS->TsCommonInfo); |
136 | pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!! | 136 | pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!! |
137 | pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!! | 137 | pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!! |
138 | ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recepient | 138 | ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recipient |
139 | } | 139 | } |
140 | 140 | ||
141 | void TSInitialize(struct ieee80211_device *ieee) | 141 | void TSInitialize(struct ieee80211_device *ieee) |
diff --git a/drivers/staging/rtl8192u/ieee80211/scatterwalk.c b/drivers/staging/rtl8192u/ieee80211/scatterwalk.c index 49f401fbce88..3543a6145046 100644 --- a/drivers/staging/rtl8192u/ieee80211/scatterwalk.c +++ b/drivers/staging/rtl8192u/ieee80211/scatterwalk.c | |||
@@ -71,7 +71,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out, | |||
71 | unsigned int more) | 71 | unsigned int more) |
72 | { | 72 | { |
73 | /* walk->data may be pointing the first byte of the next page; | 73 | /* walk->data may be pointing the first byte of the next page; |
74 | however, we know we transfered at least one byte. So, | 74 | however, we know we transferred at least one byte. So, |
75 | walk->data - 1 will be a virtual address in the mapped page. */ | 75 | walk->data - 1 will be a virtual address in the mapped page. */ |
76 | 76 | ||
77 | if (out) | 77 | if (out) |
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index da612e6d994e..e81b8ab6aa9d 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c | |||
@@ -460,7 +460,7 @@ u32 read_nic_dword(struct net_device *dev, int indx) | |||
460 | /* u8 read_phy_cck(struct net_device *dev, u8 adr); */ | 460 | /* u8 read_phy_cck(struct net_device *dev, u8 adr); */ |
461 | /* u8 read_phy_ofdm(struct net_device *dev, u8 adr); */ | 461 | /* u8 read_phy_ofdm(struct net_device *dev, u8 adr); */ |
462 | /* this might still called in what was the PHY rtl8185/rtl8192 common code | 462 | /* this might still called in what was the PHY rtl8185/rtl8192 common code |
463 | * plans are to possibilty turn it again in one common code... | 463 | * plans are to possibility turn it again in one common code... |
464 | */ | 464 | */ |
465 | inline void force_pci_posting(struct net_device *dev) | 465 | inline void force_pci_posting(struct net_device *dev) |
466 | { | 466 | { |
@@ -1378,7 +1378,7 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv | |||
1378 | //tx_agg_desc->LINIP = 0; | 1378 | //tx_agg_desc->LINIP = 0; |
1379 | //tx_agg_desc->CmdInit = 1; | 1379 | //tx_agg_desc->CmdInit = 1; |
1380 | tx_agg_desc->Offset = sizeof(tx_fwinfo_819x_usb) + 8; | 1380 | tx_agg_desc->Offset = sizeof(tx_fwinfo_819x_usb) + 8; |
1381 | /* already raw data, need not to substract header length */ | 1381 | /* already raw data, need not to subtract header length */ |
1382 | tx_agg_desc->PktSize = skb->len & 0xffff; | 1382 | tx_agg_desc->PktSize = skb->len & 0xffff; |
1383 | 1383 | ||
1384 | /*DWORD 1*/ | 1384 | /*DWORD 1*/ |
@@ -2888,7 +2888,7 @@ static void rtl8192_get_eeprom_size(struct net_device* dev) | |||
2888 | RT_TRACE(COMP_EPROM, "<===========%s(), epromtype:%d\n", __FUNCTION__, priv->epromtype); | 2888 | RT_TRACE(COMP_EPROM, "<===========%s(), epromtype:%d\n", __FUNCTION__, priv->epromtype); |
2889 | } | 2889 | } |
2890 | 2890 | ||
2891 | //used to swap endian. as ntohl & htonl are not neccessary to swap endian, so use this instead. | 2891 | //used to swap endian. as ntohl & htonl are not necessary to swap endian, so use this instead. |
2892 | static inline u16 endian_swap(u16* data) | 2892 | static inline u16 endian_swap(u16* data) |
2893 | { | 2893 | { |
2894 | u16 tmp = *data; | 2894 | u16 tmp = *data; |
diff --git a/drivers/staging/rtl8192u/r819xU_HTType.h b/drivers/staging/rtl8192u/r819xU_HTType.h index 01f58b902028..2ac421626e7c 100644 --- a/drivers/staging/rtl8192u/r819xU_HTType.h +++ b/drivers/staging/rtl8192u/r819xU_HTType.h | |||
@@ -65,7 +65,7 @@ typedef enum _HT_CHANNEL_WIDTH{ | |||
65 | }HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; | 65 | }HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; |
66 | 66 | ||
67 | // | 67 | // |
68 | // Represent Extention Channel Offset in HT Capabilities | 68 | // Represent Extension Channel Offset in HT Capabilities |
69 | // This is available only in 40Mhz mode. | 69 | // This is available only in 40Mhz mode. |
70 | // | 70 | // |
71 | typedef enum _HT_EXTCHNL_OFFSET{ | 71 | typedef enum _HT_EXTCHNL_OFFSET{ |
diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c index 41684e8fcf4c..c4586b0817d1 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.c +++ b/drivers/staging/rtl8192u/r819xU_phy.c | |||
@@ -1531,13 +1531,13 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) | |||
1531 | { | 1531 | { |
1532 | case HT_CHANNEL_WIDTH_20: | 1532 | case HT_CHANNEL_WIDTH_20: |
1533 | regBwOpMode |= BW_OPMODE_20MHZ; | 1533 | regBwOpMode |= BW_OPMODE_20MHZ; |
1534 | // 2007/02/07 Mark by Emily becasue we have not verify whether this register works | 1534 | // 2007/02/07 Mark by Emily because we have not verify whether this register works |
1535 | write_nic_byte(dev, BW_OPMODE, regBwOpMode); | 1535 | write_nic_byte(dev, BW_OPMODE, regBwOpMode); |
1536 | break; | 1536 | break; |
1537 | 1537 | ||
1538 | case HT_CHANNEL_WIDTH_20_40: | 1538 | case HT_CHANNEL_WIDTH_20_40: |
1539 | regBwOpMode &= ~BW_OPMODE_20MHZ; | 1539 | regBwOpMode &= ~BW_OPMODE_20MHZ; |
1540 | // 2007/02/07 Mark by Emily becasue we have not verify whether this register works | 1540 | // 2007/02/07 Mark by Emily because we have not verify whether this register works |
1541 | write_nic_byte(dev, BW_OPMODE, regBwOpMode); | 1541 | write_nic_byte(dev, BW_OPMODE, regBwOpMode); |
1542 | break; | 1542 | break; |
1543 | 1543 | ||
@@ -1647,7 +1647,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) | |||
1647 | } | 1647 | } |
1648 | 1648 | ||
1649 | /****************************************************************************** | 1649 | /****************************************************************************** |
1650 | *function: This function schedules bandwith switch work. | 1650 | *function: This function schedules bandwidth switch work. |
1651 | * input: struct net_device *dev | 1651 | * input: struct net_device *dev |
1652 | * HT_CHANNEL_WIDTH Bandwidth //20M or 40M | 1652 | * HT_CHANNEL_WIDTH Bandwidth //20M or 40M |
1653 | * HT_EXTCHNL_OFFSET Offset //Upper, Lower, or Don't care | 1653 | * HT_EXTCHNL_OFFSET Offset //Upper, Lower, or Don't care |
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h index 3a945b5f0e01..2dc78476b7d3 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.h +++ b/drivers/staging/rtl8712/rtl871x_cmd.h | |||
@@ -656,7 +656,7 @@ struct PT_param { | |||
656 | /* | 656 | /* |
657 | * Result: | 657 | * Result: |
658 | * 0x00: success | 658 | * 0x00: success |
659 | * 0x01: sucess, and check Response. | 659 | * 0x01: success, and check Response. |
660 | * 0x02: cmd ignored due to duplicated sequcne number | 660 | * 0x02: cmd ignored due to duplicated sequcne number |
661 | * 0x03: cmd dropped due to invalid cmd code | 661 | * 0x03: cmd dropped due to invalid cmd code |
662 | * 0x04: reserved. | 662 | * 0x04: reserved. |
diff --git a/drivers/staging/rtl8712/rtl871x_led.h b/drivers/staging/rtl8712/rtl871x_led.h index 994ef82141ab..8085e5eb82b1 100644 --- a/drivers/staging/rtl8712/rtl871x_led.h +++ b/drivers/staging/rtl8712/rtl871x_led.h | |||
@@ -78,14 +78,14 @@ struct LED_871x { | |||
78 | }; | 78 | }; |
79 | 79 | ||
80 | struct led_priv { | 80 | struct led_priv { |
81 | /* add for led controll */ | 81 | /* add for led control */ |
82 | struct LED_871x SwLed0; | 82 | struct LED_871x SwLed0; |
83 | struct LED_871x SwLed1; | 83 | struct LED_871x SwLed1; |
84 | enum LED_STRATEGY_871x LedStrategy; | 84 | enum LED_STRATEGY_871x LedStrategy; |
85 | u8 bRegUseLed; | 85 | u8 bRegUseLed; |
86 | void (*LedControlHandler)(struct _adapter *padapter, | 86 | void (*LedControlHandler)(struct _adapter *padapter, |
87 | enum LED_CTL_MODE LedAction); | 87 | enum LED_CTL_MODE LedAction); |
88 | /* add for led controll */ | 88 | /* add for led control */ |
89 | }; | 89 | }; |
90 | 90 | ||
91 | /*=========================================================================== | 91 | /*=========================================================================== |
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c index 98ba7602e250..866554d48d86 100644 --- a/drivers/staging/rtl8712/rtl871x_mlme.c +++ b/drivers/staging/rtl8712/rtl871x_mlme.c | |||
@@ -1663,7 +1663,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter) | |||
1663 | (struct ndis_wlan_bssid_ex *)pdev_network); | 1663 | (struct ndis_wlan_bssid_ex *)pdev_network); |
1664 | } | 1664 | } |
1665 | 1665 | ||
1666 | /*the fucntion is at passive_level*/ | 1666 | /*the function is at passive_level*/ |
1667 | void r8712_joinbss_reset(struct _adapter *padapter) | 1667 | void r8712_joinbss_reset(struct _adapter *padapter) |
1668 | { | 1668 | { |
1669 | int i; | 1669 | int i; |
@@ -1726,7 +1726,7 @@ unsigned int r8712_restructure_ht_ie(struct _adapter *padapter, u8 *in_ie, | |||
1726 | return phtpriv->ht_option; | 1726 | return phtpriv->ht_option; |
1727 | } | 1727 | } |
1728 | 1728 | ||
1729 | /* the fucntion is > passive_level (in critical_section) */ | 1729 | /* the function is > passive_level (in critical_section) */ |
1730 | static void update_ht_cap(struct _adapter *padapter, u8 *pie, uint ie_len) | 1730 | static void update_ht_cap(struct _adapter *padapter, u8 *pie, uint ie_len) |
1731 | { | 1731 | { |
1732 | u8 *p, max_ampdu_sz; | 1732 | u8 *p, max_ampdu_sz; |
@@ -1803,7 +1803,7 @@ void r8712_issue_addbareq_cmd(struct _adapter *padapter, int priority) | |||
1803 | } | 1803 | } |
1804 | } | 1804 | } |
1805 | 1805 | ||
1806 | /*the fucntion is >= passive_level*/ | 1806 | /*the function is >= passive_level*/ |
1807 | unsigned int r8712_add_ht_addt_info(struct _adapter *padapter, | 1807 | unsigned int r8712_add_ht_addt_info(struct _adapter *padapter, |
1808 | u8 *in_ie, u8 *out_ie, | 1808 | u8 *in_ie, u8 *out_ie, |
1809 | uint in_len, uint *pout_len) | 1809 | uint in_len, uint *pout_len) |
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.h b/drivers/staging/rtl8712/rtl871x_mlme.h index 2b35b740ab89..2794804d0822 100644 --- a/drivers/staging/rtl8712/rtl871x_mlme.h +++ b/drivers/staging/rtl8712/rtl871x_mlme.h | |||
@@ -29,7 +29,7 @@ | |||
29 | * single-tone*/ | 29 | * single-tone*/ |
30 | #define WIFI_MP_CTX_BACKGROUND_PENDING 0x00080000 /* pending in cont, tx | 30 | #define WIFI_MP_CTX_BACKGROUND_PENDING 0x00080000 /* pending in cont, tx |
31 | * background due to out of skb*/ | 31 | * background due to out of skb*/ |
32 | #define WIFI_MP_CTX_CCK_HW 0x00100000 /* in continous tx*/ | 32 | #define WIFI_MP_CTX_CCK_HW 0x00100000 /* in continuous tx*/ |
33 | #define WIFI_MP_CTX_CCK_CS 0x00200000 /* in cont, tx with carrier | 33 | #define WIFI_MP_CTX_CCK_CS 0x00200000 /* in cont, tx with carrier |
34 | * suppression*/ | 34 | * suppression*/ |
35 | #define WIFI_MP_LPBK_STATE 0x00400000 | 35 | #define WIFI_MP_LPBK_STATE 0x00400000 |
diff --git a/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h b/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h index e386fb0aac3e..23532a793859 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h +++ b/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | |||
@@ -38,7 +38,7 @@ | |||
38 | * 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00 | 38 | * 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00 |
39 | * 3. RF register 0x00-2E | 39 | * 3. RF register 0x00-2E |
40 | * 4. Bit Mask for BB/RF register | 40 | * 4. Bit Mask for BB/RF register |
41 | * 5. Other defintion for BB/RF R/W | 41 | * 5. Other definition for BB/RF R/W |
42 | * | 42 | * |
43 | * 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF | 43 | * 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF |
44 | * 1. Page1(0x100) | 44 | * 1. Page1(0x100) |
diff --git a/drivers/staging/rtl8712/usb_halinit.c b/drivers/staging/rtl8712/usb_halinit.c index 0e9483bbabe1..46287c17a417 100644 --- a/drivers/staging/rtl8712/usb_halinit.c +++ b/drivers/staging/rtl8712/usb_halinit.c | |||
@@ -112,7 +112,7 @@ u8 r8712_usb_hal_bus_init(struct _adapter *padapter) | |||
112 | /* Initialization for power on sequence, */ | 112 | /* Initialization for power on sequence, */ |
113 | r8712_write8(padapter, SPS0_CTRL + 1, 0x53); | 113 | r8712_write8(padapter, SPS0_CTRL + 1, 0x53); |
114 | r8712_write8(padapter, SPS0_CTRL, 0x57); | 114 | r8712_write8(padapter, SPS0_CTRL, 0x57); |
115 | /* Enable AFE Macro Block's Bandgap adn Enable AFE Macro | 115 | /* Enable AFE Macro Block's Bandgap and Enable AFE Macro |
116 | * Block's Mbias | 116 | * Block's Mbias |
117 | */ | 117 | */ |
118 | val8 = r8712_read8(padapter, AFE_MISC); | 118 | val8 = r8712_read8(padapter, AFE_MISC); |
diff --git a/drivers/staging/rts_pstor/rtsx_chip.h b/drivers/staging/rts_pstor/rtsx_chip.h index 713c5eaadacd..9f7cd82a1541 100644 --- a/drivers/staging/rts_pstor/rtsx_chip.h +++ b/drivers/staging/rts_pstor/rtsx_chip.h | |||
@@ -180,8 +180,8 @@ | |||
180 | #define CUR_ERR 0x70 /* current error */ | 180 | #define CUR_ERR 0x70 /* current error */ |
181 | #define DEF_ERR 0x71 /* specific command error */ | 181 | #define DEF_ERR 0x71 /* specific command error */ |
182 | 182 | ||
183 | /*---- sense key Infomation ----*/ | 183 | /*---- sense key Information ----*/ |
184 | #define SNSKEYINFO_LEN 3 /* length of sense key infomation */ | 184 | #define SNSKEYINFO_LEN 3 /* length of sense key information */ |
185 | 185 | ||
186 | #define SKSV 0x80 | 186 | #define SKSV 0x80 |
187 | #define CDB_ILLEGAL 0x40 | 187 | #define CDB_ILLEGAL 0x40 |
@@ -235,13 +235,13 @@ struct sense_data_t { | |||
235 | unsigned char seg_no; /* segment No. */ | 235 | unsigned char seg_no; /* segment No. */ |
236 | unsigned char sense_key; /* byte5 : ILI */ | 236 | unsigned char sense_key; /* byte5 : ILI */ |
237 | /* bit3-0 : sense key */ | 237 | /* bit3-0 : sense key */ |
238 | unsigned char info[4]; /* infomation */ | 238 | unsigned char info[4]; /* information */ |
239 | unsigned char ad_sense_len; /* additional sense data length */ | 239 | unsigned char ad_sense_len; /* additional sense data length */ |
240 | unsigned char cmd_info[4]; /* command specific infomation */ | 240 | unsigned char cmd_info[4]; /* command specific information */ |
241 | unsigned char asc; /* ASC */ | 241 | unsigned char asc; /* ASC */ |
242 | unsigned char ascq; /* ASCQ */ | 242 | unsigned char ascq; /* ASCQ */ |
243 | unsigned char rfu; /* FRU */ | 243 | unsigned char rfu; /* FRU */ |
244 | unsigned char sns_key_info[3]; /* sense key specific infomation */ | 244 | unsigned char sns_key_info[3]; /* sense key specific information */ |
245 | }; | 245 | }; |
246 | 246 | ||
247 | /* PCI Operation Register Address */ | 247 | /* PCI Operation Register Address */ |
diff --git a/drivers/staging/rts_pstor/rtsx_scsi.h b/drivers/staging/rts_pstor/rtsx_scsi.h index fac122c1eabd..64b84992fdb3 100644 --- a/drivers/staging/rts_pstor/rtsx_scsi.h +++ b/drivers/staging/rts_pstor/rtsx_scsi.h | |||
@@ -85,7 +85,7 @@ | |||
85 | #define CHIP_NORMALMODE 0x00 | 85 | #define CHIP_NORMALMODE 0x00 |
86 | #define CHIP_DEBUGMODE 0x01 | 86 | #define CHIP_DEBUGMODE 0x01 |
87 | 87 | ||
88 | /* SD Pass Through Command Extention */ | 88 | /* SD Pass Through Command Extension */ |
89 | #define SD_PASS_THRU_MODE 0xD0 | 89 | #define SD_PASS_THRU_MODE 0xD0 |
90 | #define SD_EXECUTE_NO_DATA 0xD1 | 90 | #define SD_EXECUTE_NO_DATA 0xD1 |
91 | #define SD_EXECUTE_READ 0xD2 | 91 | #define SD_EXECUTE_READ 0xD2 |
diff --git a/drivers/staging/rts_pstor/sd.c b/drivers/staging/rts_pstor/sd.c index 21bfa5755bec..8d066bd428c4 100644 --- a/drivers/staging/rts_pstor/sd.c +++ b/drivers/staging/rts_pstor/sd.c | |||
@@ -1719,7 +1719,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map, u8 tune_d | |||
1719 | } | 1719 | } |
1720 | 1720 | ||
1721 | Search_Finish: | 1721 | Search_Finish: |
1722 | RTSX_DEBUGP("Final choosen phase: %d\n", final_phase); | 1722 | RTSX_DEBUGP("Final chosen phase: %d\n", final_phase); |
1723 | return final_phase; | 1723 | return final_phase; |
1724 | } | 1724 | } |
1725 | 1725 | ||
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c index 71a5fbc041e4..c2f2664b61ae 100644 --- a/drivers/staging/sep/sep_driver.c +++ b/drivers/staging/sep/sep_driver.c | |||
@@ -586,7 +586,7 @@ static unsigned int sep_poll(struct file *filp, poll_table *wait) | |||
586 | dev_dbg(&sep->pdev->dev, "poll: send_ct is %lx reply ct is %lx\n", | 586 | dev_dbg(&sep->pdev->dev, "poll: send_ct is %lx reply ct is %lx\n", |
587 | sep->send_ct, sep->reply_ct); | 587 | sep->send_ct, sep->reply_ct); |
588 | 588 | ||
589 | /* Check if error occured during poll */ | 589 | /* Check if error occurred during poll */ |
590 | retval2 = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR); | 590 | retval2 = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR); |
591 | if (retval2 != 0x0) { | 591 | if (retval2 != 0x0) { |
592 | dev_warn(&sep->pdev->dev, "poll; poll error %x\n", retval2); | 592 | dev_warn(&sep->pdev->dev, "poll; poll error %x\n", retval2); |
@@ -1106,7 +1106,7 @@ static int sep_lock_user_pages(struct sep_device *sep, | |||
1106 | lli_array[count].block_size); | 1106 | lli_array[count].block_size); |
1107 | } | 1107 | } |
1108 | 1108 | ||
1109 | /* Set output params acording to the in_out flag */ | 1109 | /* Set output params according to the in_out flag */ |
1110 | if (in_out_flag == SEP_DRIVER_IN_FLAG) { | 1110 | if (in_out_flag == SEP_DRIVER_IN_FLAG) { |
1111 | *lli_array_ptr = lli_array; | 1111 | *lli_array_ptr = lli_array; |
1112 | sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages = num_pages; | 1112 | sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages = num_pages; |
@@ -1577,7 +1577,7 @@ static int sep_prepare_input_dma_table(struct sep_device *sep, | |||
1577 | 1577 | ||
1578 | /* | 1578 | /* |
1579 | * If this is not the last table - | 1579 | * If this is not the last table - |
1580 | * then allign it to the block size | 1580 | * then align it to the block size |
1581 | */ | 1581 | */ |
1582 | if (!last_table_flag) | 1582 | if (!last_table_flag) |
1583 | table_data_size = | 1583 | table_data_size = |
@@ -1974,7 +1974,7 @@ static int sep_prepare_input_output_dma_table(struct sep_device *sep, | |||
1974 | dev_dbg(&sep->pdev->dev, "SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP is %x\n", | 1974 | dev_dbg(&sep->pdev->dev, "SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP is %x\n", |
1975 | SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP); | 1975 | SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP); |
1976 | 1976 | ||
1977 | /* Call the fucntion that creates table from the lli arrays */ | 1977 | /* Call the function that creates table from the lli arrays */ |
1978 | error = sep_construct_dma_tables_from_lli(sep, lli_in_array, | 1978 | error = sep_construct_dma_tables_from_lli(sep, lli_in_array, |
1979 | sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages, | 1979 | sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages, |
1980 | lli_out_array, | 1980 | lli_out_array, |
@@ -2416,7 +2416,7 @@ end_function: | |||
2416 | * @cmd: command | 2416 | * @cmd: command |
2417 | * @arg: pointer to argument structure | 2417 | * @arg: pointer to argument structure |
2418 | * | 2418 | * |
2419 | * Implement the ioctl methods availble on the SEP device. | 2419 | * Implement the ioctl methods available on the SEP device. |
2420 | */ | 2420 | */ |
2421 | static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | 2421 | static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) |
2422 | { | 2422 | { |
diff --git a/drivers/staging/sep/sep_driver_config.h b/drivers/staging/sep/sep_driver_config.h index d3b9220f3963..1033425c9c30 100644 --- a/drivers/staging/sep/sep_driver_config.h +++ b/drivers/staging/sep/sep_driver_config.h | |||
@@ -65,11 +65,11 @@ | |||
65 | #define SEP_DRIVER_MIN_DATA_SIZE_PER_TABLE 16 | 65 | #define SEP_DRIVER_MIN_DATA_SIZE_PER_TABLE 16 |
66 | 66 | ||
67 | /* flag that signifies tah the lock is | 67 | /* flag that signifies tah the lock is |
68 | currently held by the proccess (struct file) */ | 68 | currently held by the process (struct file) */ |
69 | #define SEP_DRIVER_OWN_LOCK_FLAG 1 | 69 | #define SEP_DRIVER_OWN_LOCK_FLAG 1 |
70 | 70 | ||
71 | /* flag that signifies tah the lock is currently NOT | 71 | /* flag that signifies tah the lock is currently NOT |
72 | held by the proccess (struct file) */ | 72 | held by the process (struct file) */ |
73 | #define SEP_DRIVER_DISOWN_LOCK_FLAG 0 | 73 | #define SEP_DRIVER_DISOWN_LOCK_FLAG 0 |
74 | 74 | ||
75 | /* indicates whether driver has mapped/unmapped shared area */ | 75 | /* indicates whether driver has mapped/unmapped shared area */ |
diff --git a/drivers/staging/slicoss/README b/drivers/staging/slicoss/README index 70f49099c065..b83bba19b7f0 100644 --- a/drivers/staging/slicoss/README +++ b/drivers/staging/slicoss/README | |||
@@ -33,7 +33,7 @@ TODO: | |||
33 | - NAPI? | 33 | - NAPI? |
34 | - wasted overhead of extra stats | 34 | - wasted overhead of extra stats |
35 | - state variables for things that are | 35 | - state variables for things that are |
36 | easily availble and shouldn't be kept in card structure, cardnum, ... | 36 | easily available and shouldn't be kept in card structure, cardnum, ... |
37 | slotnumber, events, ... | 37 | slotnumber, events, ... |
38 | - get rid of slic_spinlock wrapper | 38 | - get rid of slic_spinlock wrapper |
39 | - volatile == bad design => bad code | 39 | - volatile == bad design => bad code |
diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c index d007e4a12c14..78a16a768509 100644 --- a/drivers/staging/sm7xx/smtcfb.c +++ b/drivers/staging/sm7xx/smtcfb.c | |||
@@ -965,7 +965,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, | |||
965 | goto failed; | 965 | goto failed; |
966 | 966 | ||
967 | smtcfb_setmode(sfb); | 967 | smtcfb_setmode(sfb); |
968 | /* Primary display starting from 0 postion */ | 968 | /* Primary display starting from 0 position */ |
969 | hw.BaseAddressInVRAM = 0; | 969 | hw.BaseAddressInVRAM = 0; |
970 | sfb->fb.par = &hw; | 970 | sfb->fb.par = &hw; |
971 | 971 | ||
@@ -1055,7 +1055,7 @@ static int __maybe_unused smtcfb_suspend(struct pci_dev *pdev, pm_message_t msg) | |||
1055 | 1055 | ||
1056 | pdev->dev.power.power_state = msg; | 1056 | pdev->dev.power.power_state = msg; |
1057 | 1057 | ||
1058 | /* additionaly turn off all function blocks including internal PLLs */ | 1058 | /* additionally turn off all function blocks including internal PLLs */ |
1059 | smtc_seqw(0x21, 0xff); | 1059 | smtc_seqw(0x21, 0xff); |
1060 | 1060 | ||
1061 | return 0; | 1061 | return 0; |
diff --git a/drivers/staging/speakup/keyhelp.c b/drivers/staging/speakup/keyhelp.c index 23cf7f44f450..170f38815ffd 100644 --- a/drivers/staging/speakup/keyhelp.c +++ b/drivers/staging/speakup/keyhelp.c | |||
@@ -69,7 +69,7 @@ static void build_key_data(void) | |||
69 | memset(key_offsets, 0, sizeof(key_offsets)); | 69 | memset(key_offsets, 0, sizeof(key_offsets)); |
70 | kp = state_tbl + nstates + 1; | 70 | kp = state_tbl + nstates + 1; |
71 | while (*kp++) { | 71 | while (*kp++) { |
72 | /* count occurrances of each function */ | 72 | /* count occurrences of each function */ |
73 | for (i = 0; i < nstates; i++, kp++) { | 73 | for (i = 0; i < nstates; i++, kp++) { |
74 | if (!*kp) | 74 | if (!*kp) |
75 | continue; | 75 | continue; |
diff --git a/drivers/staging/speakup/spkguide.txt b/drivers/staging/speakup/spkguide.txt index 24362eb7b8f1..f3210571e396 100644 --- a/drivers/staging/speakup/spkguide.txt +++ b/drivers/staging/speakup/spkguide.txt | |||
@@ -1091,7 +1091,7 @@ screen that is constantly changing, such as a clock or status line. | |||
1091 | 1091 | ||
1092 | There is no way to save these window settings, and you can only have one | 1092 | There is no way to save these window settings, and you can only have one |
1093 | window defined for each virtual console. There is also no way to have | 1093 | window defined for each virtual console. There is also no way to have |
1094 | windows automaticly defined for specific applications. | 1094 | windows automatically defined for specific applications. |
1095 | 1095 | ||
1096 | In order to define a window, use the review keys to move your reading | 1096 | In order to define a window, use the review keys to move your reading |
1097 | cursor to the beginning of the area you want to define. Then press | 1097 | cursor to the beginning of the area you want to define. Then press |
diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c index 007b24b54e25..20dae73d3b78 100644 --- a/drivers/staging/spectra/ffsport.c +++ b/drivers/staging/spectra/ffsport.c | |||
@@ -38,7 +38,7 @@ | |||
38 | * Outputs: Number of Used Bits | 38 | * Outputs: Number of Used Bits |
39 | * 0, if the argument is 0 | 39 | * 0, if the argument is 0 |
40 | * Description: Calculate the number of bits used by a given power of 2 number | 40 | * Description: Calculate the number of bits used by a given power of 2 number |
41 | * Number can be upto 32 bit | 41 | * Number can be up to 32 bit |
42 | *&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/ | 42 | *&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/ |
43 | int GLOB_Calc_Used_Bits(u32 n) | 43 | int GLOB_Calc_Used_Bits(u32 n) |
44 | { | 44 | { |
@@ -653,7 +653,7 @@ static int SBD_setup_device(struct spectra_nand_dev *dev, int which) | |||
653 | } | 653 | } |
654 | dev->queue->queuedata = dev; | 654 | dev->queue->queuedata = dev; |
655 | 655 | ||
656 | /* As Linux block layer doens't support >4KB hardware sector, */ | 656 | /* As Linux block layer does't support >4KB hardware sector, */ |
657 | /* Here we force report 512 byte hardware sector size to Kernel */ | 657 | /* Here we force report 512 byte hardware sector size to Kernel */ |
658 | blk_queue_logical_block_size(dev->queue, 512); | 658 | blk_queue_logical_block_size(dev->queue, 512); |
659 | 659 | ||
diff --git a/drivers/staging/spectra/flash.c b/drivers/staging/spectra/flash.c index a2f820025ae4..aead358e5c2a 100644 --- a/drivers/staging/spectra/flash.c +++ b/drivers/staging/spectra/flash.c | |||
@@ -965,7 +965,7 @@ static void process_cmd_fail_abort(int *first_failed_cmd, | |||
965 | if (0 == *first_failed_cmd) | 965 | if (0 == *first_failed_cmd) |
966 | *first_failed_cmd = PendingCMD[idx].SBDCmdIndex; | 966 | *first_failed_cmd = PendingCMD[idx].SBDCmdIndex; |
967 | 967 | ||
968 | nand_dbg_print(NAND_DBG_DEBUG, "Uncorrectable error has occured " | 968 | nand_dbg_print(NAND_DBG_DEBUG, "Uncorrectable error has occurred " |
969 | "while executing %u Command %u accesing Block %u\n", | 969 | "while executing %u Command %u accesing Block %u\n", |
970 | (unsigned int)p_BTableChangesDelta->ftl_cmd_cnt, | 970 | (unsigned int)p_BTableChangesDelta->ftl_cmd_cnt, |
971 | PendingCMD[idx].CMD, | 971 | PendingCMD[idx].CMD, |
@@ -1879,7 +1879,7 @@ static int write_back_to_l2_cache(u8 *buf, u64 logical_addr) | |||
1879 | } | 1879 | } |
1880 | 1880 | ||
1881 | /* | 1881 | /* |
1882 | * Seach in the Level2 Cache table to find the cache item. | 1882 | * Search in the Level2 Cache table to find the cache item. |
1883 | * If find, read the data from the NAND page of L2 Cache, | 1883 | * If find, read the data from the NAND page of L2 Cache, |
1884 | * Otherwise, return FAIL. | 1884 | * Otherwise, return FAIL. |
1885 | */ | 1885 | */ |
@@ -3989,7 +3989,7 @@ int GLOB_FTL_Block_Erase(u64 blk_addr) | |||
3989 | * Inputs: index to block that was just incremented and is at the max | 3989 | * Inputs: index to block that was just incremented and is at the max |
3990 | * Outputs: PASS=0 / FAIL=1 | 3990 | * Outputs: PASS=0 / FAIL=1 |
3991 | * Description: If any erase counts at MAX, adjusts erase count of every | 3991 | * Description: If any erase counts at MAX, adjusts erase count of every |
3992 | * block by substracting least worn | 3992 | * block by subtracting least worn |
3993 | * counter from counter value of every entry in wear table | 3993 | * counter from counter value of every entry in wear table |
3994 | *&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/ | 3994 | *&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/ |
3995 | static int FTL_Adjust_Relative_Erase_Count(u32 Index_of_MAX) | 3995 | static int FTL_Adjust_Relative_Erase_Count(u32 Index_of_MAX) |
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c index d55a8e40318b..3e68d58fdffd 100644 --- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | |||
@@ -71,7 +71,7 @@ | |||
71 | #define SYNAPTICS_RMI4_DEVICE_CONTROL_FUNC_NUM (0x01) | 71 | #define SYNAPTICS_RMI4_DEVICE_CONTROL_FUNC_NUM (0x01) |
72 | 72 | ||
73 | /** | 73 | /** |
74 | * struct synaptics_rmi4_fn_desc - contains the funtion descriptor information | 74 | * struct synaptics_rmi4_fn_desc - contains the function descriptor information |
75 | * @query_base_addr: base address for query | 75 | * @query_base_addr: base address for query |
76 | * @cmd_base_addr: base address for command | 76 | * @cmd_base_addr: base address for command |
77 | * @ctrl_base_addr: base address for control | 77 | * @ctrl_base_addr: base address for control |
@@ -92,7 +92,7 @@ struct synaptics_rmi4_fn_desc { | |||
92 | }; | 92 | }; |
93 | 93 | ||
94 | /** | 94 | /** |
95 | * struct synaptics_rmi4_fn - contains the funtion information | 95 | * struct synaptics_rmi4_fn - contains the function information |
96 | * @fn_number: function number | 96 | * @fn_number: function number |
97 | * @num_of_data_sources: number of data sources | 97 | * @num_of_data_sources: number of data sources |
98 | * @num_of_data_points: number of fingers touched | 98 | * @num_of_data_points: number of fingers touched |
@@ -151,7 +151,7 @@ struct synaptics_rmi4_device_info { | |||
151 | * @input_dev: pointer for input device | 151 | * @input_dev: pointer for input device |
152 | * @i2c_client: pointer for i2c client | 152 | * @i2c_client: pointer for i2c client |
153 | * @board: constant pointer for touch platform data | 153 | * @board: constant pointer for touch platform data |
154 | * @fn_list_mutex: mutex for funtion list | 154 | * @fn_list_mutex: mutex for function list |
155 | * @rmi4_page_mutex: mutex for rmi4 page | 155 | * @rmi4_page_mutex: mutex for rmi4 page |
156 | * @current_page: variable for integer | 156 | * @current_page: variable for integer |
157 | * @number_of_interrupt_register: interrupt registers count | 157 | * @number_of_interrupt_register: interrupt registers count |
@@ -278,7 +278,7 @@ static int synaptics_rmi4_i2c_byte_write(struct synaptics_rmi4_data *pdata, | |||
278 | txbuf[0] = address & MASK_8BIT; | 278 | txbuf[0] = address & MASK_8BIT; |
279 | txbuf[1] = data; | 279 | txbuf[1] = data; |
280 | retval = i2c_master_send(pdata->i2c_client, txbuf, 2); | 280 | retval = i2c_master_send(pdata->i2c_client, txbuf, 2); |
281 | /* Add in retry on writes only in certian error return values */ | 281 | /* Add in retry on writes only in certain error return values */ |
282 | if (retval != 2) { | 282 | if (retval != 2) { |
283 | dev_err(&i2c->dev, "%s:failed:%d\n", __func__, retval); | 283 | dev_err(&i2c->dev, "%s:failed:%d\n", __func__, retval); |
284 | retval = -EIO; | 284 | retval = -EIO; |
@@ -561,7 +561,7 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata, | |||
561 | } | 561 | } |
562 | /* | 562 | /* |
563 | * 2D data sources have only 3 bits for the number of fingers | 563 | * 2D data sources have only 3 bits for the number of fingers |
564 | * supported - so the encoding is a bit wierd. | 564 | * supported - so the encoding is a bit weird. |
565 | */ | 565 | */ |
566 | if ((queries[1] & MASK_3BIT) <= 4) | 566 | if ((queries[1] & MASK_3BIT) <= 4) |
567 | /* add 1 since zero based */ | 567 | /* add 1 since zero based */ |
@@ -1027,7 +1027,7 @@ err_input: | |||
1027 | * synaptics_rmi4_remove() - Removes the i2c-client touchscreen driver | 1027 | * synaptics_rmi4_remove() - Removes the i2c-client touchscreen driver |
1028 | * @client: i2c client structure pointer | 1028 | * @client: i2c client structure pointer |
1029 | * | 1029 | * |
1030 | * This funtion uses to remove the i2c-client | 1030 | * This function uses to remove the i2c-client |
1031 | * touchscreen driver and returns integer. | 1031 | * touchscreen driver and returns integer. |
1032 | */ | 1032 | */ |
1033 | static int __devexit synaptics_rmi4_remove(struct i2c_client *client) | 1033 | static int __devexit synaptics_rmi4_remove(struct i2c_client *client) |
@@ -1053,7 +1053,7 @@ static int __devexit synaptics_rmi4_remove(struct i2c_client *client) | |||
1053 | * synaptics_rmi4_suspend() - suspend the touch screen controller | 1053 | * synaptics_rmi4_suspend() - suspend the touch screen controller |
1054 | * @dev: pointer to device structure | 1054 | * @dev: pointer to device structure |
1055 | * | 1055 | * |
1056 | * This funtion is used to suspend the | 1056 | * This function is used to suspend the |
1057 | * touch panel controller and returns integer | 1057 | * touch panel controller and returns integer |
1058 | */ | 1058 | */ |
1059 | static int synaptics_rmi4_suspend(struct device *dev) | 1059 | static int synaptics_rmi4_suspend(struct device *dev) |
@@ -1089,7 +1089,7 @@ static int synaptics_rmi4_suspend(struct device *dev) | |||
1089 | * synaptics_rmi4_resume() - resume the touch screen controller | 1089 | * synaptics_rmi4_resume() - resume the touch screen controller |
1090 | * @dev: pointer to device structure | 1090 | * @dev: pointer to device structure |
1091 | * | 1091 | * |
1092 | * This funtion is used to resume the touch panel | 1092 | * This function is used to resume the touch panel |
1093 | * controller and returns integer. | 1093 | * controller and returns integer. |
1094 | */ | 1094 | */ |
1095 | static int synaptics_rmi4_resume(struct device *dev) | 1095 | static int synaptics_rmi4_resume(struct device *dev) |
@@ -1148,7 +1148,7 @@ static struct i2c_driver synaptics_rmi4_driver = { | |||
1148 | /** | 1148 | /** |
1149 | * synaptics_rmi4_init() - Initialize the touchscreen driver | 1149 | * synaptics_rmi4_init() - Initialize the touchscreen driver |
1150 | * | 1150 | * |
1151 | * This funtion uses to initializes the synaptics | 1151 | * This function uses to initializes the synaptics |
1152 | * touchscreen driver and returns integer. | 1152 | * touchscreen driver and returns integer. |
1153 | */ | 1153 | */ |
1154 | static int __init synaptics_rmi4_init(void) | 1154 | static int __init synaptics_rmi4_init(void) |
@@ -1158,7 +1158,7 @@ static int __init synaptics_rmi4_init(void) | |||
1158 | /** | 1158 | /** |
1159 | * synaptics_rmi4_exit() - De-initialize the touchscreen driver | 1159 | * synaptics_rmi4_exit() - De-initialize the touchscreen driver |
1160 | * | 1160 | * |
1161 | * This funtion uses to de-initialize the synaptics | 1161 | * This function uses to de-initialize the synaptics |
1162 | * touchscreen driver and returns none. | 1162 | * touchscreen driver and returns none. |
1163 | */ | 1163 | */ |
1164 | static void __exit synaptics_rmi4_exit(void) | 1164 | static void __exit synaptics_rmi4_exit(void) |
diff --git a/drivers/staging/tidspbridge/core/_tiomap.h b/drivers/staging/tidspbridge/core/_tiomap.h index 1e0273e50d2b..7cb587103975 100644 --- a/drivers/staging/tidspbridge/core/_tiomap.h +++ b/drivers/staging/tidspbridge/core/_tiomap.h | |||
@@ -366,7 +366,7 @@ extern s32 dsp_debug; | |||
366 | * ======== sm_interrupt_dsp ======== | 366 | * ======== sm_interrupt_dsp ======== |
367 | * Purpose: | 367 | * Purpose: |
368 | * Set interrupt value & send an interrupt to the DSP processor(s). | 368 | * Set interrupt value & send an interrupt to the DSP processor(s). |
369 | * This is typicaly used when mailbox interrupt mechanisms allow data | 369 | * This is typically used when mailbox interrupt mechanisms allow data |
370 | * to be associated with interrupt such as for OMAP's CMD/DATA regs. | 370 | * to be associated with interrupt such as for OMAP's CMD/DATA regs. |
371 | * Parameters: | 371 | * Parameters: |
372 | * dev_context: Handle to Bridge driver defined device info. | 372 | * dev_context: Handle to Bridge driver defined device info. |
diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c index 8381130e1460..6d66e7d0fba8 100644 --- a/drivers/staging/tidspbridge/core/chnl_sm.c +++ b/drivers/staging/tidspbridge/core/chnl_sm.c | |||
@@ -578,7 +578,7 @@ int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 timeout, | |||
578 | } else if (stat_sync == -EPERM) { | 578 | } else if (stat_sync == -EPERM) { |
579 | /* This can occur when the user mode thread is | 579 | /* This can occur when the user mode thread is |
580 | * aborted (^C), or when _VWIN32_WaitSingleObject() | 580 | * aborted (^C), or when _VWIN32_WaitSingleObject() |
581 | * fails due to unkown causes. */ | 581 | * fails due to unknown causes. */ |
582 | /* Even though Wait failed, there may be something in | 582 | /* Even though Wait failed, there may be something in |
583 | * the Q: */ | 583 | * the Q: */ |
584 | if (list_empty(&pchnl->io_completions)) { | 584 | if (list_empty(&pchnl->io_completions)) { |
diff --git a/drivers/staging/tidspbridge/dynload/cload.c b/drivers/staging/tidspbridge/dynload/cload.c index 390040984e03..5cecd237e3f6 100644 --- a/drivers/staging/tidspbridge/dynload/cload.c +++ b/drivers/staging/tidspbridge/dynload/cload.c | |||
@@ -718,7 +718,7 @@ static void dload_symbols(struct dload_state *dlthis) | |||
718 | * as a temporary for .dllview record construction. | 718 | * as a temporary for .dllview record construction. |
719 | * Allocate storage for the whole table. Add 1 to the section count | 719 | * Allocate storage for the whole table. Add 1 to the section count |
720 | * in case a trampoline section is auto-generated as well as the | 720 | * in case a trampoline section is auto-generated as well as the |
721 | * size of the trampoline section name so DLLView doens't get lost. | 721 | * size of the trampoline section name so DLLView does't get lost. |
722 | */ | 722 | */ |
723 | 723 | ||
724 | siz = sym_count * sizeof(struct local_symbol); | 724 | siz = sym_count * sizeof(struct local_symbol); |
diff --git a/drivers/staging/tidspbridge/hw/hw_mmu.c b/drivers/staging/tidspbridge/hw/hw_mmu.c index 014f5d5293ae..c214df9b205e 100644 --- a/drivers/staging/tidspbridge/hw/hw_mmu.c +++ b/drivers/staging/tidspbridge/hw/hw_mmu.c | |||
@@ -59,7 +59,7 @@ enum hw_mmu_page_size_t { | |||
59 | * RETURNS: | 59 | * RETURNS: |
60 | * | 60 | * |
61 | * Type : hw_status | 61 | * Type : hw_status |
62 | * Description : 0 -- No errors occured | 62 | * Description : 0 -- No errors occurred |
63 | * RET_BAD_NULL_PARAM -- A Pointer | 63 | * RET_BAD_NULL_PARAM -- A Pointer |
64 | * Paramater was set to NULL | 64 | * Paramater was set to NULL |
65 | * | 65 | * |
@@ -102,7 +102,7 @@ static hw_status mmu_flush_entry(const void __iomem *base_address); | |||
102 | * RETURNS: | 102 | * RETURNS: |
103 | * | 103 | * |
104 | * Type : hw_status | 104 | * Type : hw_status |
105 | * Description : 0 -- No errors occured | 105 | * Description : 0 -- No errors occurred |
106 | * RET_BAD_NULL_PARAM -- A Pointer Paramater | 106 | * RET_BAD_NULL_PARAM -- A Pointer Paramater |
107 | * was set to NULL | 107 | * was set to NULL |
108 | * RET_PARAM_OUT_OF_RANGE -- Input Parameter out | 108 | * RET_PARAM_OUT_OF_RANGE -- Input Parameter out |
@@ -147,7 +147,7 @@ static hw_status mmu_set_cam_entry(const void __iomem *base_address, | |||
147 | * RETURNS: | 147 | * RETURNS: |
148 | * | 148 | * |
149 | * Type : hw_status | 149 | * Type : hw_status |
150 | * Description : 0 -- No errors occured | 150 | * Description : 0 -- No errors occurred |
151 | * RET_BAD_NULL_PARAM -- A Pointer Paramater | 151 | * RET_BAD_NULL_PARAM -- A Pointer Paramater |
152 | * was set to NULL | 152 | * was set to NULL |
153 | * RET_PARAM_OUT_OF_RANGE -- Input Parameter | 153 | * RET_PARAM_OUT_OF_RANGE -- Input Parameter |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h b/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h index d60e25258020..6e7ab4fd8c39 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h | |||
@@ -144,7 +144,7 @@ struct chnl_object { | |||
144 | s8 chnl_mode; /* Chnl mode and attributes */ | 144 | s8 chnl_mode; /* Chnl mode and attributes */ |
145 | /* Chnl I/O completion event (user mode) */ | 145 | /* Chnl I/O completion event (user mode) */ |
146 | void *user_event; | 146 | void *user_event; |
147 | /* Abstract syncronization object */ | 147 | /* Abstract synchronization object */ |
148 | struct sync_object *sync_event; | 148 | struct sync_object *sync_event; |
149 | u32 process; /* Process which created this channel */ | 149 | u32 process; /* Process which created this channel */ |
150 | u32 cb_arg; /* Argument to use with callback */ | 150 | u32 cb_arg; /* Argument to use with callback */ |
@@ -156,7 +156,7 @@ struct chnl_object { | |||
156 | struct list_head io_completions; | 156 | struct list_head io_completions; |
157 | struct list_head free_packets_list; /* List of free Irps */ | 157 | struct list_head free_packets_list; /* List of free Irps */ |
158 | struct ntfy_object *ntfy_obj; | 158 | struct ntfy_object *ntfy_obj; |
159 | u32 bytes_moved; /* Total number of bytes transfered */ | 159 | u32 bytes_moved; /* Total number of bytes transferred */ |
160 | 160 | ||
161 | /* For DSP-DMA */ | 161 | /* For DSP-DMA */ |
162 | 162 | ||
diff --git a/drivers/staging/tidspbridge/include/dspbridge/clk.h b/drivers/staging/tidspbridge/include/dspbridge/clk.h index b23950323421..685341c50693 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/clk.h +++ b/drivers/staging/tidspbridge/include/dspbridge/clk.h | |||
@@ -55,7 +55,7 @@ extern void dsp_clk_exit(void); | |||
55 | * Initializes private state of CLK module. | 55 | * Initializes private state of CLK module. |
56 | * Parameters: | 56 | * Parameters: |
57 | * Returns: | 57 | * Returns: |
58 | * TRUE if initialized; FALSE if error occured. | 58 | * TRUE if initialized; FALSE if error occurred. |
59 | * Requires: | 59 | * Requires: |
60 | * Ensures: | 60 | * Ensures: |
61 | * CLK initialized. | 61 | * CLK initialized. |
@@ -71,7 +71,7 @@ void dsp_gpt_wait_overflow(short int clk_id, unsigned int load); | |||
71 | * Parameters: | 71 | * Parameters: |
72 | * Returns: | 72 | * Returns: |
73 | * 0: Success. | 73 | * 0: Success. |
74 | * -EPERM: Error occured while enabling the clock. | 74 | * -EPERM: Error occurred while enabling the clock. |
75 | * Requires: | 75 | * Requires: |
76 | * Ensures: | 76 | * Ensures: |
77 | */ | 77 | */ |
@@ -86,7 +86,7 @@ u32 dsp_clock_enable_all(u32 dsp_per_clocks); | |||
86 | * Parameters: | 86 | * Parameters: |
87 | * Returns: | 87 | * Returns: |
88 | * 0: Success. | 88 | * 0: Success. |
89 | * -EPERM: Error occured while disabling the clock. | 89 | * -EPERM: Error occurred while disabling the clock. |
90 | * Requires: | 90 | * Requires: |
91 | * Ensures: | 91 | * Ensures: |
92 | */ | 92 | */ |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cmm.h b/drivers/staging/tidspbridge/include/dspbridge/cmm.h index 27a21b5f3ff0..aff22051cf57 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/cmm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/cmm.h | |||
@@ -190,7 +190,7 @@ extern int cmm_get_info(struct cmm_object *hcmm_mgr, | |||
190 | * Initializes private state of CMM module. | 190 | * Initializes private state of CMM module. |
191 | * Parameters: | 191 | * Parameters: |
192 | * Returns: | 192 | * Returns: |
193 | * TRUE if initialized; FALSE if error occured. | 193 | * TRUE if initialized; FALSE if error occurred. |
194 | * Requires: | 194 | * Requires: |
195 | * Ensures: | 195 | * Ensures: |
196 | * CMM initialized. | 196 | * CMM initialized. |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h index 53bd4bb8b0bb..cb684c11b302 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/cod.h +++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h | |||
@@ -249,7 +249,7 @@ extern int cod_get_sym_value(struct cod_manager *cod_mgr_obj, | |||
249 | * Parameters: | 249 | * Parameters: |
250 | * None. | 250 | * None. |
251 | * Returns: | 251 | * Returns: |
252 | * TRUE if initialized; FALSE if error occured. | 252 | * TRUE if initialized; FALSE if error occurred. |
253 | * Requires: | 253 | * Requires: |
254 | * Ensures: | 254 | * Ensures: |
255 | * A requirement for each of the other public COD functions. | 255 | * A requirement for each of the other public COD functions. |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h index f41e4783157f..f92b4be0b413 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/dev.h +++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h | |||
@@ -497,7 +497,7 @@ extern void dev_exit(void); | |||
497 | * Initialize DEV's private state, keeping a reference count on each call. | 497 | * Initialize DEV's private state, keeping a reference count on each call. |
498 | * Parameters: | 498 | * Parameters: |
499 | * Returns: | 499 | * Returns: |
500 | * TRUE if initialized; FALSE if error occured. | 500 | * TRUE if initialized; FALSE if error occurred. |
501 | * Requires: | 501 | * Requires: |
502 | * Ensures: | 502 | * Ensures: |
503 | * TRUE: A requirement for the other public DEV functions. | 503 | * TRUE: A requirement for the other public DEV functions. |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h b/drivers/staging/tidspbridge/include/dspbridge/drv.h index 25ef1a2c58eb..9cdbd955dce9 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/drv.h +++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h | |||
@@ -154,7 +154,7 @@ struct process_context { | |||
154 | * Parameters: | 154 | * Parameters: |
155 | * drv_obj: Location to store created DRV Object handle. | 155 | * drv_obj: Location to store created DRV Object handle. |
156 | * Returns: | 156 | * Returns: |
157 | * 0: Sucess | 157 | * 0: Success |
158 | * -ENOMEM: Failed in Memory allocation | 158 | * -ENOMEM: Failed in Memory allocation |
159 | * -EPERM: General Failure | 159 | * -EPERM: General Failure |
160 | * Requires: | 160 | * Requires: |
@@ -170,7 +170,7 @@ struct process_context { | |||
170 | * There is one Driver Object for the Driver representing | 170 | * There is one Driver Object for the Driver representing |
171 | * the driver itself. It contains the list of device | 171 | * the driver itself. It contains the list of device |
172 | * Objects and the list of Device Extensions in the system. | 172 | * Objects and the list of Device Extensions in the system. |
173 | * Also it can hold other neccessary | 173 | * Also it can hold other necessary |
174 | * information in its storage area. | 174 | * information in its storage area. |
175 | */ | 175 | */ |
176 | extern int drv_create(struct drv_object **drv_obj); | 176 | extern int drv_create(struct drv_object **drv_obj); |
@@ -180,7 +180,7 @@ extern int drv_create(struct drv_object **drv_obj); | |||
180 | * Purpose: | 180 | * Purpose: |
181 | * destroys the Dev Object list, DrvExt list | 181 | * destroys the Dev Object list, DrvExt list |
182 | * and destroy the DRV object | 182 | * and destroy the DRV object |
183 | * Called upon driver unLoading.or unsuccesful loading of the driver. | 183 | * Called upon driver unLoading.or unsuccessful loading of the driver. |
184 | * Parameters: | 184 | * Parameters: |
185 | * driver_obj: Handle to Driver object . | 185 | * driver_obj: Handle to Driver object . |
186 | * Returns: | 186 | * Returns: |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h index c2ba26c09308..ed32bf383132 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h +++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h | |||
@@ -52,7 +52,7 @@ struct bridge_dev_context; | |||
52 | * dev_ctxt: Handle to Bridge driver defined device context. | 52 | * dev_ctxt: Handle to Bridge driver defined device context. |
53 | * Returns: | 53 | * Returns: |
54 | * 0: Success. | 54 | * 0: Success. |
55 | * -ETIMEDOUT: Timeout occured waiting for a response from hardware. | 55 | * -ETIMEDOUT: Timeout occurred waiting for a response from hardware. |
56 | * -EPERM: Other, unspecified error. | 56 | * -EPERM: Other, unspecified error. |
57 | * Requires: | 57 | * Requires: |
58 | * dev_ctxt != NULL | 58 | * dev_ctxt != NULL |
@@ -91,7 +91,7 @@ typedef int(*fxn_brd_setstate) (struct bridge_dev_context | |||
91 | * dsp_addr: DSP address at which to start execution. | 91 | * dsp_addr: DSP address at which to start execution. |
92 | * Returns: | 92 | * Returns: |
93 | * 0: Success. | 93 | * 0: Success. |
94 | * -ETIMEDOUT: Timeout occured waiting for a response from hardware. | 94 | * -ETIMEDOUT: Timeout occurred waiting for a response from hardware. |
95 | * -EPERM: Other, unspecified error. | 95 | * -EPERM: Other, unspecified error. |
96 | * Requires: | 96 | * Requires: |
97 | * dev_ctxt != NULL | 97 | * dev_ctxt != NULL |
@@ -142,7 +142,7 @@ typedef int(*fxn_brd_memcopy) (struct bridge_dev_context | |||
142 | * mem_type: Memory space on DSP to which to transfer. | 142 | * mem_type: Memory space on DSP to which to transfer. |
143 | * Returns: | 143 | * Returns: |
144 | * 0: Success. | 144 | * 0: Success. |
145 | * -ETIMEDOUT: Timeout occured waiting for a response from hardware. | 145 | * -ETIMEDOUT: Timeout occurred waiting for a response from hardware. |
146 | * -EPERM: Other, unspecified error. | 146 | * -EPERM: Other, unspecified error. |
147 | * Requires: | 147 | * Requires: |
148 | * dev_ctxt != NULL; | 148 | * dev_ctxt != NULL; |
@@ -205,7 +205,7 @@ typedef int(*fxn_brd_memunmap) (struct bridge_dev_context | |||
205 | * dev_ctxt: Handle to Bridge driver defined device context. | 205 | * dev_ctxt: Handle to Bridge driver defined device context. |
206 | * Returns: | 206 | * Returns: |
207 | * 0: Success. | 207 | * 0: Success. |
208 | * -ETIMEDOUT: Timeout occured waiting for a response from hardware. | 208 | * -ETIMEDOUT: Timeout occurred waiting for a response from hardware. |
209 | * -EPERM: Other, unspecified error. | 209 | * -EPERM: Other, unspecified error. |
210 | * Requires: | 210 | * Requires: |
211 | * dev_ctxt != NULL | 211 | * dev_ctxt != NULL |
@@ -248,7 +248,7 @@ typedef int(*fxn_brd_status) (struct bridge_dev_context *dev_ctxt, | |||
248 | * mem_type: Memory space on DSP from which to transfer. | 248 | * mem_type: Memory space on DSP from which to transfer. |
249 | * Returns: | 249 | * Returns: |
250 | * 0: Success. | 250 | * 0: Success. |
251 | * -ETIMEDOUT: Timeout occured waiting for a response from hardware. | 251 | * -ETIMEDOUT: Timeout occurred waiting for a response from hardware. |
252 | * -EPERM: Other, unspecified error. | 252 | * -EPERM: Other, unspecified error. |
253 | * Requires: | 253 | * Requires: |
254 | * dev_ctxt != NULL; | 254 | * dev_ctxt != NULL; |
@@ -274,7 +274,7 @@ typedef int(*fxn_brd_read) (struct bridge_dev_context *dev_ctxt, | |||
274 | * mem_type: Memory space on DSP to which to transfer. | 274 | * mem_type: Memory space on DSP to which to transfer. |
275 | * Returns: | 275 | * Returns: |
276 | * 0: Success. | 276 | * 0: Success. |
277 | * -ETIMEDOUT: Timeout occured waiting for a response from hardware. | 277 | * -ETIMEDOUT: Timeout occurred waiting for a response from hardware. |
278 | * -EPERM: Other, unspecified error. | 278 | * -EPERM: Other, unspecified error. |
279 | * Requires: | 279 | * Requires: |
280 | * dev_ctxt != NULL; | 280 | * dev_ctxt != NULL; |
@@ -601,7 +601,7 @@ typedef int(*fxn_chnl_getmgrinfo) (struct chnl_mgr | |||
601 | * Returns: | 601 | * Returns: |
602 | * 0: Success; | 602 | * 0: Success; |
603 | * -EFAULT: Invalid chnl_obj. | 603 | * -EFAULT: Invalid chnl_obj. |
604 | * -ETIMEDOUT: Timeout occured before channel could be idled. | 604 | * -ETIMEDOUT: Timeout occurred before channel could be idled. |
605 | * Requires: | 605 | * Requires: |
606 | * Ensures: | 606 | * Ensures: |
607 | */ | 607 | */ |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/mgr.h b/drivers/staging/tidspbridge/include/dspbridge/mgr.h index e506c4d49472..47b0318430e1 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/mgr.h +++ b/drivers/staging/tidspbridge/include/dspbridge/mgr.h | |||
@@ -176,7 +176,7 @@ extern void mgr_exit(void); | |||
176 | * mgr_handle: Handle to the Manager Object | 176 | * mgr_handle: Handle to the Manager Object |
177 | * dcd_handle: Ptr to receive the DCD Handle. | 177 | * dcd_handle: Ptr to receive the DCD Handle. |
178 | * Returns: | 178 | * Returns: |
179 | * 0: Sucess | 179 | * 0: Success |
180 | * -EPERM: Failure to get the Handle | 180 | * -EPERM: Failure to get the Handle |
181 | * Requires: | 181 | * Requires: |
182 | * MGR is initialized. | 182 | * MGR is initialized. |
@@ -195,7 +195,7 @@ extern int mgr_get_dcd_handle(struct mgr_object | |||
195 | * call. Initializes the DCD. | 195 | * call. Initializes the DCD. |
196 | * Parameters: | 196 | * Parameters: |
197 | * Returns: | 197 | * Returns: |
198 | * TRUE if initialized; FALSE if error occured. | 198 | * TRUE if initialized; FALSE if error occurred. |
199 | * Requires: | 199 | * Requires: |
200 | * Ensures: | 200 | * Ensures: |
201 | * TRUE: A requirement for the other public MGR functions. | 201 | * TRUE: A requirement for the other public MGR functions. |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h index 53da0ef483c8..16371d818e3d 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/node.h +++ b/drivers/staging/tidspbridge/include/dspbridge/node.h | |||
@@ -44,7 +44,7 @@ | |||
44 | * -ESPIPE: iAlg functions not found for a DAIS node. | 44 | * -ESPIPE: iAlg functions not found for a DAIS node. |
45 | * -EDOM: attr_in != NULL and attr_in->prio out of | 45 | * -EDOM: attr_in != NULL and attr_in->prio out of |
46 | * range. | 46 | * range. |
47 | * -EPERM: A failure occured, unable to allocate node. | 47 | * -EPERM: A failure occurred, unable to allocate node. |
48 | * -EBADR: Proccessor is not in the running state. | 48 | * -EBADR: Proccessor is not in the running state. |
49 | * Requires: | 49 | * Requires: |
50 | * node_init(void) called. | 50 | * node_init(void) called. |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/proc.h b/drivers/staging/tidspbridge/include/dspbridge/proc.h index 5e09fd165d9d..f00dffd51989 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/proc.h +++ b/drivers/staging/tidspbridge/include/dspbridge/proc.h | |||
@@ -89,7 +89,7 @@ extern int proc_auto_start(struct cfg_devnode *dev_node_obj, | |||
89 | * Returns: | 89 | * Returns: |
90 | * 0 : SUCCESS | 90 | * 0 : SUCCESS |
91 | * -EFAULT : Invalid processor handle. | 91 | * -EFAULT : Invalid processor handle. |
92 | * -ETIME: A Timeout Occured before the Control information | 92 | * -ETIME: A Timeout Occurred before the Control information |
93 | * could be sent. | 93 | * could be sent. |
94 | * -EPERM : General Failure. | 94 | * -EPERM : General Failure. |
95 | * Requires: | 95 | * Requires: |
@@ -169,7 +169,7 @@ extern int proc_enum_nodes(void *hprocessor, | |||
169 | * 0 : Success. | 169 | * 0 : Success. |
170 | * -EFAULT : Invalid processor handle. | 170 | * -EFAULT : Invalid processor handle. |
171 | * -EBADR: The processor is not in the PROC_RUNNING state. | 171 | * -EBADR: The processor is not in the PROC_RUNNING state. |
172 | * -ETIME: A timeout occured before the DSP responded to the | 172 | * -ETIME: A timeout occurred before the DSP responded to the |
173 | * querry. | 173 | * querry. |
174 | * -EPERM : Unable to get Resource Information | 174 | * -EPERM : Unable to get Resource Information |
175 | * Requires: | 175 | * Requires: |
@@ -229,7 +229,7 @@ extern int proc_get_dev_object(void *hprocessor, | |||
229 | * call. | 229 | * call. |
230 | * Parameters: | 230 | * Parameters: |
231 | * Returns: | 231 | * Returns: |
232 | * TRUE if initialized; FALSE if error occured. | 232 | * TRUE if initialized; FALSE if error occurred. |
233 | * Requires: | 233 | * Requires: |
234 | * Ensures: | 234 | * Ensures: |
235 | * TRUE: A requirement for the other public PROC functions. | 235 | * TRUE: A requirement for the other public PROC functions. |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/pwr.h b/drivers/staging/tidspbridge/include/dspbridge/pwr.h index 5e3ab2123aaa..0fb066488da9 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/pwr.h +++ b/drivers/staging/tidspbridge/include/dspbridge/pwr.h | |||
@@ -46,7 +46,7 @@ | |||
46 | * 0: Success. | 46 | * 0: Success. |
47 | * 0: Success, but the DSP was already asleep. | 47 | * 0: Success, but the DSP was already asleep. |
48 | * -EINVAL: The specified sleep_code is not supported. | 48 | * -EINVAL: The specified sleep_code is not supported. |
49 | * -ETIME: A timeout occured while waiting for DSP sleep | 49 | * -ETIME: A timeout occurred while waiting for DSP sleep |
50 | * confirmation. | 50 | * confirmation. |
51 | * -EPERM: General failure, unable to send sleep command to | 51 | * -EPERM: General failure, unable to send sleep command to |
52 | * the DSP. | 52 | * the DSP. |
@@ -67,7 +67,7 @@ extern int pwr_sleep_dsp(const u32 sleep_code, const u32 timeout); | |||
67 | * Returns: | 67 | * Returns: |
68 | * 0: Success. | 68 | * 0: Success. |
69 | * 0: Success, but the DSP was already awake. | 69 | * 0: Success, but the DSP was already awake. |
70 | * -ETIME: A timeout occured while waiting for wake | 70 | * -ETIME: A timeout occurred while waiting for wake |
71 | * confirmation. | 71 | * confirmation. |
72 | * -EPERM: General failure, unable to send wake command to | 72 | * -EPERM: General failure, unable to send wake command to |
73 | * the DSP. | 73 | * the DSP. |
@@ -85,7 +85,7 @@ extern int pwr_wake_dsp(const u32 timeout); | |||
85 | * Returns: | 85 | * Returns: |
86 | * 0: Success. | 86 | * 0: Success. |
87 | * 0: Success, but the DSP was already awake. | 87 | * 0: Success, but the DSP was already awake. |
88 | * -ETIME: A timeout occured while waiting for wake | 88 | * -ETIME: A timeout occurred while waiting for wake |
89 | * confirmation. | 89 | * confirmation. |
90 | * -EPERM: General failure, unable to send wake command to | 90 | * -EPERM: General failure, unable to send wake command to |
91 | * the DSP. | 91 | * the DSP. |
@@ -103,7 +103,7 @@ extern int pwr_pm_pre_scale(u16 voltage_domain, u32 level); | |||
103 | * Returns: | 103 | * Returns: |
104 | * 0: Success. | 104 | * 0: Success. |
105 | * 0: Success, but the DSP was already awake. | 105 | * 0: Success, but the DSP was already awake. |
106 | * -ETIME: A timeout occured while waiting for wake | 106 | * -ETIME: A timeout occurred while waiting for wake |
107 | * confirmation. | 107 | * confirmation. |
108 | * -EPERM: General failure, unable to send wake command to | 108 | * -EPERM: General failure, unable to send wake command to |
109 | * the DSP. | 109 | * the DSP. |
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c index 9a38d86a84a0..522810bc7427 100644 --- a/drivers/staging/tidspbridge/pmgr/dev.c +++ b/drivers/staging/tidspbridge/pmgr/dev.c | |||
@@ -787,7 +787,7 @@ int dev_notify_clients(struct dev_object *dev_obj, u32 ret) | |||
787 | 787 | ||
788 | /* | 788 | /* |
789 | * FIXME: this code needs struct proc_object to have a list_head | 789 | * FIXME: this code needs struct proc_object to have a list_head |
790 | * at the begining. If not, this can go horribly wrong. | 790 | * at the beginning. If not, this can go horribly wrong. |
791 | */ | 791 | */ |
792 | list_for_each(curr, &dev_obj->proc_list) | 792 | list_for_each(curr, &dev_obj->proc_list) |
793 | proc_notify_clients((void *)curr, ret); | 793 | proc_notify_clients((void *)curr, ret); |
@@ -810,7 +810,7 @@ int dev_remove_device(struct cfg_devnode *dev_node_obj) | |||
810 | if (!dev_node_obj) | 810 | if (!dev_node_obj) |
811 | status = -EFAULT; | 811 | status = -EFAULT; |
812 | 812 | ||
813 | /* Retrieve the device object handle originaly stored with | 813 | /* Retrieve the device object handle originally stored with |
814 | * the dev_node: */ | 814 | * the dev_node: */ |
815 | if (!status) { | 815 | if (!status) { |
816 | /* check the device string and then store dev object */ | 816 | /* check the device string and then store dev object */ |
@@ -986,7 +986,7 @@ int dev_insert_proc_object(struct dev_object *hdev_obj, | |||
986 | /* Add DevObject to tail. */ | 986 | /* Add DevObject to tail. */ |
987 | /* | 987 | /* |
988 | * FIXME: this code needs struct proc_object to have a list_head | 988 | * FIXME: this code needs struct proc_object to have a list_head |
989 | * at the begining. If not, this can go horribly wrong. | 989 | * at the beginning. If not, this can go horribly wrong. |
990 | */ | 990 | */ |
991 | list_add_tail((struct list_head *)proc_obj, &dev_obj->proc_list); | 991 | list_add_tail((struct list_head *)proc_obj, &dev_obj->proc_list); |
992 | 992 | ||
diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c index 8c88583364eb..db8215f540d8 100644 --- a/drivers/staging/tidspbridge/rmgr/drv.c +++ b/drivers/staging/tidspbridge/rmgr/drv.c | |||
@@ -609,7 +609,7 @@ int drv_request_resources(u32 dw_context, u32 *dev_node_strg) | |||
609 | DBC_REQUIRE(dev_node_strg != NULL); | 609 | DBC_REQUIRE(dev_node_strg != NULL); |
610 | 610 | ||
611 | /* | 611 | /* |
612 | * Allocate memory to hold the string. This will live untill | 612 | * Allocate memory to hold the string. This will live until |
613 | * it is freed in the Release resources. Update the driver object | 613 | * it is freed in the Release resources. Update the driver object |
614 | * list. | 614 | * list. |
615 | */ | 615 | */ |
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c index fb5c2ba01d47..0e70cba15ebc 100644 --- a/drivers/staging/tidspbridge/rmgr/nldr.c +++ b/drivers/staging/tidspbridge/rmgr/nldr.c | |||
@@ -57,9 +57,9 @@ | |||
57 | * uuuuuuuu|fueeeeee|fudddddd|fucccccc| | 57 | * uuuuuuuu|fueeeeee|fudddddd|fucccccc| |
58 | * where | 58 | * where |
59 | * u = unused | 59 | * u = unused |
60 | * cccccc = prefered/required dynamic mem segid for create phase data/code | 60 | * cccccc = preferred/required dynamic mem segid for create phase data/code |
61 | * dddddd = prefered/required dynamic mem segid for delete phase data/code | 61 | * dddddd = preferred/required dynamic mem segid for delete phase data/code |
62 | * eeeeee = prefered/req. dynamic mem segid for execute phase data/code | 62 | * eeeeee = preferred/req. dynamic mem segid for execute phase data/code |
63 | * f = flag indicating if memory is preferred or required: | 63 | * f = flag indicating if memory is preferred or required: |
64 | * f = 1 if required, f = 0 if preferred. | 64 | * f = 1 if required, f = 0 if preferred. |
65 | * | 65 | * |
diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c index c4e5c4e0d71c..242dd1399996 100644 --- a/drivers/staging/tidspbridge/rmgr/proc.c +++ b/drivers/staging/tidspbridge/rmgr/proc.c | |||
@@ -1670,7 +1670,7 @@ int proc_stop(void *hprocessor) | |||
1670 | if (!status) { | 1670 | if (!status) { |
1671 | dev_dbg(bridge, "%s: processor in standby mode\n", __func__); | 1671 | dev_dbg(bridge, "%s: processor in standby mode\n", __func__); |
1672 | p_proc_object->proc_state = PROC_STOPPED; | 1672 | p_proc_object->proc_state = PROC_STOPPED; |
1673 | /* Destory the Node Manager, msg_ctrl Manager */ | 1673 | /* Destroy the Node Manager, msg_ctrl Manager */ |
1674 | if (!(dev_destroy2(p_proc_object->dev_obj))) { | 1674 | if (!(dev_destroy2(p_proc_object->dev_obj))) { |
1675 | /* Destroy the msg_ctrl by calling msg_delete */ | 1675 | /* Destroy the msg_ctrl by calling msg_delete */ |
1676 | dev_get_msg_mgr(p_proc_object->dev_obj, &hmsg_mgr); | 1676 | dev_get_msg_mgr(p_proc_object->dev_obj, &hmsg_mgr); |
@@ -1827,7 +1827,7 @@ static int proc_monitor(struct proc_object *proc_obj) | |||
1827 | 1827 | ||
1828 | /* This is needed only when Device is loaded when it is | 1828 | /* This is needed only when Device is loaded when it is |
1829 | * already 'ACTIVE' */ | 1829 | * already 'ACTIVE' */ |
1830 | /* Destory the Node Manager, msg_ctrl Manager */ | 1830 | /* Destroy the Node Manager, msg_ctrl Manager */ |
1831 | if (!dev_destroy2(proc_obj->dev_obj)) { | 1831 | if (!dev_destroy2(proc_obj->dev_obj)) { |
1832 | /* Destroy the msg_ctrl by calling msg_delete */ | 1832 | /* Destroy the msg_ctrl by calling msg_delete */ |
1833 | dev_get_msg_mgr(proc_obj->dev_obj, &hmsg_mgr); | 1833 | dev_get_msg_mgr(proc_obj->dev_obj, &hmsg_mgr); |
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c index c80a316d9d8f..17db6684abbe 100644 --- a/drivers/staging/tm6000/tm6000-video.c +++ b/drivers/staging/tm6000/tm6000-video.c | |||
@@ -182,7 +182,7 @@ static inline void get_next_buf(struct tm6000_dmaqueue *dma_q, | |||
182 | if (!buf) | 182 | if (!buf) |
183 | return; | 183 | return; |
184 | 184 | ||
185 | /* Cleans up buffer - Usefull for testing for frame/URB loss */ | 185 | /* Cleans up buffer - Useful for testing for frame/URB loss */ |
186 | outp = videobuf_to_vmalloc(&(*buf)->vb); | 186 | outp = videobuf_to_vmalloc(&(*buf)->vb); |
187 | 187 | ||
188 | return; | 188 | return; |
diff --git a/drivers/staging/tty/cd1865.h b/drivers/staging/tty/cd1865.h index 9940966e7a1d..8c2ad654b79d 100644 --- a/drivers/staging/tty/cd1865.h +++ b/drivers/staging/tty/cd1865.h | |||
@@ -9,7 +9,7 @@ | |||
9 | * Please DO contact io8-linux@specialix.co.uk if you require | 9 | * Please DO contact io8-linux@specialix.co.uk if you require |
10 | * support. | 10 | * support. |
11 | * | 11 | * |
12 | * This driver was developped in the BitWizard linux device | 12 | * This driver was developed in the BitWizard linux device |
13 | * driver service. If you require a linux device driver for your | 13 | * driver service. If you require a linux device driver for your |
14 | * product, please contact devices@BitWizard.nl for a quote. | 14 | * product, please contact devices@BitWizard.nl for a quote. |
15 | * | 15 | * |
diff --git a/drivers/staging/tty/epca.c b/drivers/staging/tty/epca.c index 7ad3638967ae..7f1369e5b418 100644 --- a/drivers/staging/tty/epca.c +++ b/drivers/staging/tty/epca.c | |||
@@ -7,7 +7,7 @@ | |||
7 | ** This driver is no longer supported by Digi ** | 7 | ** This driver is no longer supported by Digi ** |
8 | 8 | ||
9 | Much of this design and code came from epca.c which was | 9 | Much of this design and code came from epca.c which was |
10 | copyright (C) 1994, 1995 Troy De Jongh, and subsquently | 10 | copyright (C) 1994, 1995 Troy De Jongh, and subsequently |
11 | modified by David Nugent, Christoph Lameter, Mike McLagan. | 11 | modified by David Nugent, Christoph Lameter, Mike McLagan. |
12 | 12 | ||
13 | This program is free software; you can redistribute it and/or modify | 13 | This program is free software; you can redistribute it and/or modify |
@@ -471,7 +471,7 @@ static void shutdown(struct channel *ch, struct tty_struct *tty) | |||
471 | memoff(ch); | 471 | memoff(ch); |
472 | 472 | ||
473 | /* | 473 | /* |
474 | * The channel has officialy been closed. The next time it is opened it | 474 | * The channel has officially been closed. The next time it is opened it |
475 | * will have to reinitialized. Set a flag to indicate this. | 475 | * will have to reinitialized. Set a flag to indicate this. |
476 | */ | 476 | */ |
477 | /* Prevent future Digi programmed interrupts from coming active */ | 477 | /* Prevent future Digi programmed interrupts from coming active */ |
@@ -975,7 +975,7 @@ static int __init pc_init(void) | |||
975 | 975 | ||
976 | /* | 976 | /* |
977 | * Note : If lilo was used to configure the driver and the ignore | 977 | * Note : If lilo was used to configure the driver and the ignore |
978 | * epcaconfig option was choosen (digiepca=2) then nbdevs and num_cards | 978 | * epcaconfig option was chosen (digiepca=2) then nbdevs and num_cards |
979 | * will equal 0 at this point. This is okay; PCI cards will still be | 979 | * will equal 0 at this point. This is okay; PCI cards will still be |
980 | * picked up if detected. | 980 | * picked up if detected. |
981 | */ | 981 | */ |
@@ -1230,14 +1230,14 @@ static void post_fep_init(unsigned int crd) | |||
1230 | memaddr = bd->re_map_membase; | 1230 | memaddr = bd->re_map_membase; |
1231 | 1231 | ||
1232 | /* | 1232 | /* |
1233 | * The below assignment will set bc to point at the BEGINING of the | 1233 | * The below assignment will set bc to point at the BEGINNING of the |
1234 | * cards channel structures. For 1 card there will be between 8 and 64 | 1234 | * cards channel structures. For 1 card there will be between 8 and 64 |
1235 | * of these structures. | 1235 | * of these structures. |
1236 | */ | 1236 | */ |
1237 | bc = memaddr + CHANSTRUCT; | 1237 | bc = memaddr + CHANSTRUCT; |
1238 | 1238 | ||
1239 | /* | 1239 | /* |
1240 | * The below assignment will set gd to point at the BEGINING of global | 1240 | * The below assignment will set gd to point at the BEGINNING of global |
1241 | * memory address 0xc00. The first data in that global memory actually | 1241 | * memory address 0xc00. The first data in that global memory actually |
1242 | * starts at address 0xc1a. The command in pointer begins at 0xd10. | 1242 | * starts at address 0xc1a. The command in pointer begins at 0xd10. |
1243 | */ | 1243 | */ |
@@ -1492,7 +1492,7 @@ static void doevent(int crd) | |||
1492 | /* | 1492 | /* |
1493 | * The two assignments below get the current modem status | 1493 | * The two assignments below get the current modem status |
1494 | * (mstat) and the previous modem status (lstat). These are | 1494 | * (mstat) and the previous modem status (lstat). These are |
1495 | * useful becuase an event could signal a change in modem | 1495 | * useful because an event could signal a change in modem |
1496 | * signals itself. | 1496 | * signals itself. |
1497 | */ | 1497 | */ |
1498 | mstat = readb(eventbuf + 2); | 1498 | mstat = readb(eventbuf + 2); |
@@ -1897,7 +1897,7 @@ static void receive_data(struct channel *ch, struct tty_struct *tty) | |||
1897 | /* | 1897 | /* |
1898 | * Even if head has wrapped around only report the amount of | 1898 | * Even if head has wrapped around only report the amount of |
1899 | * data to be equal to the size - tail. Remember memcpy can't | 1899 | * data to be equal to the size - tail. Remember memcpy can't |
1900 | * automaticly wrap around the receive buffer. | 1900 | * automatically wrap around the receive buffer. |
1901 | */ | 1901 | */ |
1902 | dataToRead = (wrapgap < bytesAvailable) ? wrapgap | 1902 | dataToRead = (wrapgap < bytesAvailable) ? wrapgap |
1903 | : bytesAvailable; | 1903 | : bytesAvailable; |
@@ -2543,7 +2543,7 @@ static void __init epca_setup(char *str, int *ints) | |||
2543 | break; | 2543 | break; |
2544 | /* | 2544 | /* |
2545 | * If the index incremented above refers to a | 2545 | * If the index incremented above refers to a |
2546 | * legitamate board type set it here. | 2546 | * legitimate board type set it here. |
2547 | */ | 2547 | */ |
2548 | if (index < EPCA_NUM_TYPES) | 2548 | if (index < EPCA_NUM_TYPES) |
2549 | board.type = loop; | 2549 | board.type = loop; |
diff --git a/drivers/staging/tty/ip2/i2hw.h b/drivers/staging/tty/ip2/i2hw.h index c0ba6c05f0cd..8df2f487217a 100644 --- a/drivers/staging/tty/ip2/i2hw.h +++ b/drivers/staging/tty/ip2/i2hw.h | |||
@@ -335,7 +335,7 @@ be off by a factor of five. The important point is that the first command reset | |||
335 | in fact generates a reset pulse on the board. This pulse is guaranteed to last | 335 | in fact generates a reset pulse on the board. This pulse is guaranteed to last |
336 | less than 10 milliseconds. The additional delay ensures the 1400 has had the | 336 | less than 10 milliseconds. The additional delay ensures the 1400 has had the |
337 | chance to respond sufficiently to the first reset. Why not a longer delay? Much | 337 | chance to respond sufficiently to the first reset. Why not a longer delay? Much |
338 | more than 50 milliseconds gets to be noticable, but the board would still work. | 338 | more than 50 milliseconds gets to be noticeable, but the board would still work. |
339 | 339 | ||
340 | Once all 16 bytes of the Power-on Reset Message have been read, the bootstrap | 340 | Once all 16 bytes of the Power-on Reset Message have been read, the bootstrap |
341 | firmware is ready to receive loadware. | 341 | firmware is ready to receive loadware. |
@@ -399,7 +399,7 @@ typedef union _porStr // "por" stands for Power On Reset | |||
399 | // expandable products must report a MAP of available channels. Since | 399 | // expandable products must report a MAP of available channels. Since |
400 | // each UART supports four ports, we represent each UART found by a | 400 | // each UART supports four ports, we represent each UART found by a |
401 | // single bit. Using two bytes to supply the mapping information we | 401 | // single bit. Using two bytes to supply the mapping information we |
402 | // report the presense or absense of up to 16 UARTS, or 64 ports in | 402 | // report the presence or absence of up to 16 UARTS, or 64 ports in |
403 | // steps of 4 ports. For -IIEX products, the ports are numbered | 403 | // steps of 4 ports. For -IIEX products, the ports are numbered |
404 | // starting at the box closest to the controller in the "chain". | 404 | // starting at the box closest to the controller in the "chain". |
405 | 405 | ||
diff --git a/drivers/staging/tty/ip2/i2lib.c b/drivers/staging/tty/ip2/i2lib.c index 0d10b89218ed..13a3caba85f2 100644 --- a/drivers/staging/tty/ip2/i2lib.c +++ b/drivers/staging/tty/ip2/i2lib.c | |||
@@ -821,7 +821,7 @@ i2GetStatus(i2ChanStrPtr pCh, int resetBits) | |||
821 | // | 821 | // |
822 | // Description: | 822 | // Description: |
823 | // Strips data from the input buffer and writes it to pDest. If there is a | 823 | // Strips data from the input buffer and writes it to pDest. If there is a |
824 | // collosal blunder, (invalid structure pointers or the like), returns -1. | 824 | // colossal blunder, (invalid structure pointers or the like), returns -1. |
825 | // Otherwise, returns the number of bytes read. | 825 | // Otherwise, returns the number of bytes read. |
826 | //****************************************************************************** | 826 | //****************************************************************************** |
827 | static int | 827 | static int |
@@ -909,7 +909,7 @@ i2Input_exit: | |||
909 | // Returns: Number of bytes stripped, or -1 for error | 909 | // Returns: Number of bytes stripped, or -1 for error |
910 | // | 910 | // |
911 | // Description: | 911 | // Description: |
912 | // Strips any data from the input buffer. If there is a collosal blunder, | 912 | // Strips any data from the input buffer. If there is a colossal blunder, |
913 | // (invalid structure pointers or the like), returns -1. Otherwise, returns the | 913 | // (invalid structure pointers or the like), returns -1. Otherwise, returns the |
914 | // number of bytes stripped. | 914 | // number of bytes stripped. |
915 | //****************************************************************************** | 915 | //****************************************************************************** |
@@ -963,7 +963,7 @@ i2InputFlush(i2ChanStrPtr pCh) | |||
963 | // Returns: Number of bytes available, or -1 for error | 963 | // Returns: Number of bytes available, or -1 for error |
964 | // | 964 | // |
965 | // Description: | 965 | // Description: |
966 | // If there is a collosal blunder, (invalid structure pointers or the like), | 966 | // If there is a colossal blunder, (invalid structure pointers or the like), |
967 | // returns -1. Otherwise, returns the number of bytes stripped. Otherwise, | 967 | // returns -1. Otherwise, returns the number of bytes stripped. Otherwise, |
968 | // returns the number of bytes available in the buffer. | 968 | // returns the number of bytes available in the buffer. |
969 | //****************************************************************************** | 969 | //****************************************************************************** |
@@ -1001,7 +1001,7 @@ i2InputAvailable(i2ChanStrPtr pCh) | |||
1001 | // | 1001 | // |
1002 | // Description: | 1002 | // Description: |
1003 | // Queues the data at pSource to be sent as data packets to the board. If there | 1003 | // Queues the data at pSource to be sent as data packets to the board. If there |
1004 | // is a collosal blunder, (invalid structure pointers or the like), returns -1. | 1004 | // is a colossal blunder, (invalid structure pointers or the like), returns -1. |
1005 | // Otherwise, returns the number of bytes written. What if there is not enough | 1005 | // Otherwise, returns the number of bytes written. What if there is not enough |
1006 | // room for all the data? If pCh->channelOptions & CO_NBLOCK_WRITE is set, then | 1006 | // room for all the data? If pCh->channelOptions & CO_NBLOCK_WRITE is set, then |
1007 | // we transfer as many characters as we can now, then return. If this bit is | 1007 | // we transfer as many characters as we can now, then return. If this bit is |
diff --git a/drivers/staging/tty/ip2/ip2main.c b/drivers/staging/tty/ip2/ip2main.c index ea7a8fb08283..ba074fbb4ce2 100644 --- a/drivers/staging/tty/ip2/ip2main.c +++ b/drivers/staging/tty/ip2/ip2main.c | |||
@@ -1824,7 +1824,7 @@ ip2_flush_chars( PTTY tty ) | |||
1824 | // ip2trace (CHANN, ITRC_PUTC, 10, 1, strip ); | 1824 | // ip2trace (CHANN, ITRC_PUTC, 10, 1, strip ); |
1825 | 1825 | ||
1826 | // | 1826 | // |
1827 | // We may need to restart i2Output if it does not fullfill this request | 1827 | // We may need to restart i2Output if it does not fulfill this request |
1828 | // | 1828 | // |
1829 | strip = i2Output( pCh, pCh->Pbuf, pCh->Pbuf_stuff); | 1829 | strip = i2Output( pCh, pCh->Pbuf, pCh->Pbuf_stuff); |
1830 | if ( strip != pCh->Pbuf_stuff ) { | 1830 | if ( strip != pCh->Pbuf_stuff ) { |
diff --git a/drivers/staging/tty/specialix.c b/drivers/staging/tty/specialix.c index 17a1be536a46..cb24c6d999db 100644 --- a/drivers/staging/tty/specialix.c +++ b/drivers/staging/tty/specialix.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * support. But please read the documentation (specialix.txt) | 9 | * support. But please read the documentation (specialix.txt) |
10 | * first. | 10 | * first. |
11 | * | 11 | * |
12 | * This driver was developped in the BitWizard linux device | 12 | * This driver was developed in the BitWizard linux device |
13 | * driver service. If you require a linux device driver for your | 13 | * driver service. If you require a linux device driver for your |
14 | * product, please contact devices@BitWizard.nl for a quote. | 14 | * product, please contact devices@BitWizard.nl for a quote. |
15 | * | 15 | * |
@@ -978,7 +978,7 @@ static void sx_change_speed(struct specialix_board *bp, | |||
978 | spin_lock_irqsave(&bp->lock, flags); | 978 | spin_lock_irqsave(&bp->lock, flags); |
979 | sx_out(bp, CD186x_CAR, port_No(port)); | 979 | sx_out(bp, CD186x_CAR, port_No(port)); |
980 | 980 | ||
981 | /* The Specialix board doens't implement the RTS lines. | 981 | /* The Specialix board does't implement the RTS lines. |
982 | They are used to set the IRQ level. Don't touch them. */ | 982 | They are used to set the IRQ level. Don't touch them. */ |
983 | if (sx_crtscts(tty)) | 983 | if (sx_crtscts(tty)) |
984 | port->MSVR = MSVR_DTR | (sx_in(bp, CD186x_MSVR) & MSVR_RTS); | 984 | port->MSVR = MSVR_DTR | (sx_in(bp, CD186x_MSVR) & MSVR_RTS); |
diff --git a/drivers/staging/tty/specialix_io8.h b/drivers/staging/tty/specialix_io8.h index c63005274d9b..1215d7e2cb37 100644 --- a/drivers/staging/tty/specialix_io8.h +++ b/drivers/staging/tty/specialix_io8.h | |||
@@ -10,7 +10,7 @@ | |||
10 | * Please DO contact io8-linux@specialix.co.uk if you require | 10 | * Please DO contact io8-linux@specialix.co.uk if you require |
11 | * support. | 11 | * support. |
12 | * | 12 | * |
13 | * This driver was developped in the BitWizard linux device | 13 | * This driver was developed in the BitWizard linux device |
14 | * driver service. If you require a linux device driver for your | 14 | * driver service. If you require a linux device driver for your |
15 | * product, please contact devices@BitWizard.nl for a quote. | 15 | * product, please contact devices@BitWizard.nl for a quote. |
16 | * | 16 | * |
@@ -79,7 +79,7 @@ more than a few PCI versions of the card. */ | |||
79 | 79 | ||
80 | #define SPECIALIX_MAGIC 0x0907 | 80 | #define SPECIALIX_MAGIC 0x0907 |
81 | 81 | ||
82 | #define SX_CCR_TIMEOUT 10000 /* CCR timeout. You may need to wait upto | 82 | #define SX_CCR_TIMEOUT 10000 /* CCR timeout. You may need to wait up to |
83 | 10 milliseconds before the internal | 83 | 10 milliseconds before the internal |
84 | processor is available again after | 84 | processor is available again after |
85 | you give it a command */ | 85 | you give it a command */ |
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index e23484998598..0f02a4b12ae4 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c | |||
@@ -194,7 +194,7 @@ void rh_port_disconnect(int rhport) | |||
194 | * | 194 | * |
195 | * So, the maximum number of ports is 31 ( port 0 to port 30) ? | 195 | * So, the maximum number of ports is 31 ( port 0 to port 30) ? |
196 | * | 196 | * |
197 | * The return value is the actual transfered length in byte. If nothing has | 197 | * The return value is the actual transferred length in byte. If nothing has |
198 | * been changed, return 0. In the case that the number of ports is less than or | 198 | * been changed, return 0. In the case that the number of ports is less than or |
199 | * equal to 6 (VHCI_NPORTS==7), return 1. | 199 | * equal to 6 (VHCI_NPORTS==7), return 1. |
200 | * | 200 | * |
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c index d4a48c4e59c2..a4007287ef47 100644 --- a/drivers/staging/vme/bridges/vme_ca91cx42.c +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c | |||
@@ -621,7 +621,7 @@ static int ca91cx42_master_set(struct vme_master_resource *image, int enabled, | |||
621 | 621 | ||
622 | /* | 622 | /* |
623 | * Let's allocate the resource here rather than further up the stack as | 623 | * Let's allocate the resource here rather than further up the stack as |
624 | * it avoids pushing loads of bus dependant stuff up the stack | 624 | * it avoids pushing loads of bus dependent stuff up the stack |
625 | */ | 625 | */ |
626 | retval = ca91cx42_alloc_resource(image, size); | 626 | retval = ca91cx42_alloc_resource(image, size); |
627 | if (retval) { | 627 | if (retval) { |
@@ -1052,7 +1052,7 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list, | |||
1052 | pci_attr = dest->private; | 1052 | pci_attr = dest->private; |
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | /* Check we can do fullfill required attributes */ | 1055 | /* Check we can do fulfill required attributes */ |
1056 | if ((vme_attr->aspace & ~(VME_A16 | VME_A24 | VME_A32 | VME_USER1 | | 1056 | if ((vme_attr->aspace & ~(VME_A16 | VME_A24 | VME_A32 | VME_USER1 | |
1057 | VME_USER2)) != 0) { | 1057 | VME_USER2)) != 0) { |
1058 | 1058 | ||
@@ -1069,7 +1069,7 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list, | |||
1069 | goto err_cycle; | 1069 | goto err_cycle; |
1070 | } | 1070 | } |
1071 | 1071 | ||
1072 | /* Check to see if we can fullfill source and destination */ | 1072 | /* Check to see if we can fulfill source and destination */ |
1073 | if (!(((src->type == VME_DMA_PCI) && (dest->type == VME_DMA_VME)) || | 1073 | if (!(((src->type == VME_DMA_PCI) && (dest->type == VME_DMA_VME)) || |
1074 | ((src->type == VME_DMA_VME) && (dest->type == VME_DMA_PCI)))) { | 1074 | ((src->type == VME_DMA_VME) && (dest->type == VME_DMA_PCI)))) { |
1075 | 1075 | ||
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c index b00a53e793e7..106aa9daff48 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.c +++ b/drivers/staging/vme/bridges/vme_tsi148.c | |||
@@ -928,7 +928,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, | |||
928 | spin_lock(&image->lock); | 928 | spin_lock(&image->lock); |
929 | 929 | ||
930 | /* Let's allocate the resource here rather than further up the stack as | 930 | /* Let's allocate the resource here rather than further up the stack as |
931 | * it avoids pushing loads of bus dependant stuff up the stack. If size | 931 | * it avoids pushing loads of bus dependent stuff up the stack. If size |
932 | * is zero, any existing resource will be freed. | 932 | * is zero, any existing resource will be freed. |
933 | */ | 933 | */ |
934 | retval = tsi148_alloc_resource(image, size); | 934 | retval = tsi148_alloc_resource(image, size); |
@@ -1320,7 +1320,7 @@ static ssize_t tsi148_master_write(struct vme_master_resource *image, void *buf, | |||
1320 | 1320 | ||
1321 | /* | 1321 | /* |
1322 | * Writes are posted. We need to do a read on the VME bus to flush out | 1322 | * Writes are posted. We need to do a read on the VME bus to flush out |
1323 | * all of the writes before we check for errors. We can't guarentee | 1323 | * all of the writes before we check for errors. We can't guarantee |
1324 | * that reading the data we have just written is safe. It is believed | 1324 | * that reading the data we have just written is safe. It is believed |
1325 | * that there isn't any read, write re-ordering, so we can read any | 1325 | * that there isn't any read, write re-ordering, so we can read any |
1326 | * location in VME space, so lets read the Device ID from the tsi148's | 1326 | * location in VME space, so lets read the Device ID from the tsi148's |
diff --git a/drivers/staging/vme/bridges/vme_tsi148.h b/drivers/staging/vme/bridges/vme_tsi148.h index 9f97fa8084e8..a3ac2fe98816 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.h +++ b/drivers/staging/vme/bridges/vme_tsi148.h | |||
@@ -212,7 +212,7 @@ static const int TSI148_LCSR_OT[8] = { TSI148_LCSR_OT0, TSI148_LCSR_OT1, | |||
212 | #define TSI148_LCSR_OFFSET_OTAT 0x1C | 212 | #define TSI148_LCSR_OFFSET_OTAT 0x1C |
213 | 213 | ||
214 | /* | 214 | /* |
215 | * VMEbus interupt ack | 215 | * VMEbus interrupt ack |
216 | * offset 200 | 216 | * offset 200 |
217 | */ | 217 | */ |
218 | #define TSI148_LCSR_VIACK1 0x204 | 218 | #define TSI148_LCSR_VIACK1 0x204 |
@@ -613,7 +613,7 @@ static const int TSI148_GCSR_MBOX[4] = { TSI148_GCSR_MBOX0, | |||
613 | /* | 613 | /* |
614 | * PCI-X Status Register (CRG +$054) | 614 | * PCI-X Status Register (CRG +$054) |
615 | */ | 615 | */ |
616 | #define TSI148_PCFS_PCIXSTAT_RSCEM (1<<29) /* Recieved Split Comp Error */ | 616 | #define TSI148_PCFS_PCIXSTAT_RSCEM (1<<29) /* Received Split Comp Error */ |
617 | #define TSI148_PCFS_PCIXSTAT_DMCRS_M (7<<26) /* max Cumulative Read Size */ | 617 | #define TSI148_PCFS_PCIXSTAT_DMCRS_M (7<<26) /* max Cumulative Read Size */ |
618 | #define TSI148_PCFS_PCIXSTAT_DMOST_M (7<<23) /* max outstanding Split Trans | 618 | #define TSI148_PCFS_PCIXSTAT_DMOST_M (7<<23) /* max outstanding Split Trans |
619 | */ | 619 | */ |
@@ -982,8 +982,8 @@ static const int TSI148_GCSR_MBOX[4] = { TSI148_GCSR_MBOX0, | |||
982 | #define TSI148_LCSR_VICR_CNTS_IRQ1 (2<<22) /* IRQ1 to Cntr */ | 982 | #define TSI148_LCSR_VICR_CNTS_IRQ1 (2<<22) /* IRQ1 to Cntr */ |
983 | #define TSI148_LCSR_VICR_CNTS_IRQ2 (3<<22) /* IRQ2 to Cntr */ | 983 | #define TSI148_LCSR_VICR_CNTS_IRQ2 (3<<22) /* IRQ2 to Cntr */ |
984 | 984 | ||
985 | #define TSI148_LCSR_VICR_EDGIS_M (3<<20) /* Edge interupt MASK */ | 985 | #define TSI148_LCSR_VICR_EDGIS_M (3<<20) /* Edge interrupt MASK */ |
986 | #define TSI148_LCSR_VICR_EDGIS_DIS (1<<20) /* Edge interupt Disable */ | 986 | #define TSI148_LCSR_VICR_EDGIS_DIS (1<<20) /* Edge interrupt Disable */ |
987 | #define TSI148_LCSR_VICR_EDGIS_IRQ1 (2<<20) /* IRQ1 to Edge */ | 987 | #define TSI148_LCSR_VICR_EDGIS_IRQ1 (2<<20) /* IRQ1 to Edge */ |
988 | #define TSI148_LCSR_VICR_EDGIS_IRQ2 (3<<20) /* IRQ2 to Edge */ | 988 | #define TSI148_LCSR_VICR_EDGIS_IRQ2 (3<<20) /* IRQ2 to Edge */ |
989 | 989 | ||
diff --git a/drivers/staging/vme/vme_api.txt b/drivers/staging/vme/vme_api.txt index a910a0c4388b..4910e92c52af 100644 --- a/drivers/staging/vme/vme_api.txt +++ b/drivers/staging/vme/vme_api.txt | |||
@@ -6,7 +6,7 @@ Driver registration | |||
6 | 6 | ||
7 | As with other subsystems within the Linux kernel, VME device drivers register | 7 | As with other subsystems within the Linux kernel, VME device drivers register |
8 | with the VME subsystem, typically called from the devices init routine. This is | 8 | with the VME subsystem, typically called from the devices init routine. This is |
9 | achieved via a call to the follwoing function: | 9 | achieved via a call to the following function: |
10 | 10 | ||
11 | int vme_register_driver (struct vme_driver *driver); | 11 | int vme_register_driver (struct vme_driver *driver); |
12 | 12 | ||
@@ -108,7 +108,7 @@ Master windows | |||
108 | ============== | 108 | ============== |
109 | 109 | ||
110 | Master windows provide access from the local processor[s] out onto the VME bus. | 110 | Master windows provide access from the local processor[s] out onto the VME bus. |
111 | The number of windows available and the available access modes is dependant on | 111 | The number of windows available and the available access modes is dependent on |
112 | the underlying chipset. A window must be configured before it can be used. | 112 | the underlying chipset. A window must be configured before it can be used. |
113 | 113 | ||
114 | 114 | ||
@@ -163,7 +163,7 @@ Slave windows | |||
163 | 163 | ||
164 | Slave windows provide devices on the VME bus access into mapped portions of the | 164 | Slave windows provide devices on the VME bus access into mapped portions of the |
165 | local memory. The number of windows available and the access modes that can be | 165 | local memory. The number of windows available and the access modes that can be |
166 | used is dependant on the underlying chipset. A window must be configured before | 166 | used is dependent on the underlying chipset. A window must be configured before |
167 | it can be used. | 167 | it can be used. |
168 | 168 | ||
169 | 169 | ||
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 951a3a8ddcb2..2721e0798496 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c | |||
@@ -1186,7 +1186,7 @@ CARDbStartMeasure ( | |||
1186 | wDuration += 1; // 1 TU for channel switching | 1186 | wDuration += 1; // 1 TU for channel switching |
1187 | 1187 | ||
1188 | if ((LODWORD(qwStartTSF) == 0) && (HIDWORD(qwStartTSF) == 0)) { | 1188 | if ((LODWORD(qwStartTSF) == 0) && (HIDWORD(qwStartTSF) == 0)) { |
1189 | // start imediately by setting start TSF == current TSF + 2 TU | 1189 | // start immediately by setting start TSF == current TSF + 2 TU |
1190 | LODWORD(qwStartTSF) = LODWORD(qwCurrTSF) + 2048; | 1190 | LODWORD(qwStartTSF) = LODWORD(qwCurrTSF) + 2048; |
1191 | HIDWORD(qwStartTSF) = HIDWORD(qwCurrTSF); | 1191 | HIDWORD(qwStartTSF) = HIDWORD(qwCurrTSF); |
1192 | if (LODWORD(qwCurrTSF) > LODWORD(qwStartTSF)) { | 1192 | if (LODWORD(qwCurrTSF) > LODWORD(qwStartTSF)) { |
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index efaf19bc07b7..ad39c8727e9b 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c | |||
@@ -137,7 +137,7 @@ DEVICE_PARAM(TxDescriptors1,"Number of transmit descriptors1"); | |||
137 | /* IP_byte_align[] is used for IP header unsigned long byte aligned | 137 | /* IP_byte_align[] is used for IP header unsigned long byte aligned |
138 | 0: indicate the IP header won't be unsigned long byte aligned.(Default) . | 138 | 0: indicate the IP header won't be unsigned long byte aligned.(Default) . |
139 | 1: indicate the IP header will be unsigned long byte aligned. | 139 | 1: indicate the IP header will be unsigned long byte aligned. |
140 | In some enviroment, the IP header should be unsigned long byte aligned, | 140 | In some environment, the IP header should be unsigned long byte aligned, |
141 | or the packet will be droped when we receive it. (eg: IPVS) | 141 | or the packet will be droped when we receive it. (eg: IPVS) |
142 | */ | 142 | */ |
143 | DEVICE_PARAM(IP_byte_align,"Enable IP header dword aligned"); | 143 | DEVICE_PARAM(IP_byte_align,"Enable IP header dword aligned"); |
diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index abd6745bc3fe..c30170a2bc44 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c | |||
@@ -587,7 +587,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS | |||
587 | if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) { | 587 | if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) { |
588 | 588 | ||
589 | // Call mgr to begin the deauthentication | 589 | // Call mgr to begin the deauthentication |
590 | // reason = (3) beacuse sta has left ESS | 590 | // reason = (3) because sta has left ESS |
591 | if (pMgmt->eCurrState>= WMAC_STATE_AUTH) { | 591 | if (pMgmt->eCurrState>= WMAC_STATE_AUTH) { |
592 | vMgrDeAuthenBeginSta((void *)pDevice, pMgmt, pMgmt->abyCurrBSSID, (3), &Status); | 592 | vMgrDeAuthenBeginSta((void *)pDevice, pMgmt, pMgmt->abyCurrBSSID, (3), &Status); |
593 | } | 593 | } |
diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h index 141e80b843af..e3ae562f521a 100644 --- a/drivers/staging/vt6655/wmgr.h +++ b/drivers/staging/vt6655/wmgr.h | |||
@@ -220,7 +220,7 @@ typedef enum tagWMAC_POWER_MODE { | |||
220 | */ | 220 | */ |
221 | 221 | ||
222 | 222 | ||
223 | // Tx Managment Packet descriptor | 223 | // Tx Management Packet descriptor |
224 | typedef struct tagSTxMgmtPacket { | 224 | typedef struct tagSTxMgmtPacket { |
225 | 225 | ||
226 | PUWLAN_80211HDR p80211Header; | 226 | PUWLAN_80211HDR p80211Header; |
@@ -230,7 +230,7 @@ typedef struct tagSTxMgmtPacket { | |||
230 | } STxMgmtPacket, *PSTxMgmtPacket; | 230 | } STxMgmtPacket, *PSTxMgmtPacket; |
231 | 231 | ||
232 | 232 | ||
233 | // Rx Managment Packet descriptor | 233 | // Rx Management Packet descriptor |
234 | typedef struct tagSRxMgmtPacket { | 234 | typedef struct tagSRxMgmtPacket { |
235 | 235 | ||
236 | PUWLAN_80211HDR p80211Header; | 236 | PUWLAN_80211HDR p80211Header; |
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 8f18578a5903..5185d61564d7 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c | |||
@@ -1938,7 +1938,7 @@ s_vGenerateMACHeader ( | |||
1938 | * Out: | 1938 | * Out: |
1939 | * none | 1939 | * none |
1940 | * | 1940 | * |
1941 | * Return Value: CMD_STATUS_PENDING if MAC Tx resource avaliable; otherwise FALSE | 1941 | * Return Value: CMD_STATUS_PENDING if MAC Tx resource available; otherwise FALSE |
1942 | * | 1942 | * |
1943 | -*/ | 1943 | -*/ |
1944 | 1944 | ||
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index b83b660b1f0f..019fb52de366 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c | |||
@@ -421,7 +421,7 @@ void vRunCommand(void *hDeviceContext) | |||
421 | pMgmt->eScanState = WMAC_IS_SCANNING; | 421 | pMgmt->eScanState = WMAC_IS_SCANNING; |
422 | pDevice->byScanBBType = pDevice->byBBType; //lucas | 422 | pDevice->byScanBBType = pDevice->byBBType; //lucas |
423 | pDevice->bStopDataPkt = TRUE; | 423 | pDevice->bStopDataPkt = TRUE; |
424 | // Turn off RCR_BSSID filter everytime | 424 | // Turn off RCR_BSSID filter every time |
425 | MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_BSSID); | 425 | MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_BSSID); |
426 | pDevice->byRxMode &= ~RCR_BSSID; | 426 | pDevice->byRxMode &= ~RCR_BSSID; |
427 | 427 | ||
@@ -604,7 +604,7 @@ void vRunCommand(void *hDeviceContext) | |||
604 | // if Infra mode | 604 | // if Infra mode |
605 | if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) { | 605 | if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) { |
606 | // Call mgr to begin the deauthentication | 606 | // Call mgr to begin the deauthentication |
607 | // reason = (3) beacuse sta has left ESS | 607 | // reason = (3) because sta has left ESS |
608 | if (pMgmt->eCurrState >= WMAC_STATE_AUTH) { | 608 | if (pMgmt->eCurrState >= WMAC_STATE_AUTH) { |
609 | vMgrDeAuthenBeginSta((void *)pDevice, | 609 | vMgrDeAuthenBeginSta((void *)pDevice, |
610 | pMgmt, | 610 | pMgmt, |
diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h index 594f3a89d8a7..13dfb3bf8328 100644 --- a/drivers/staging/vt6656/wmgr.h +++ b/drivers/staging/vt6656/wmgr.h | |||
@@ -218,7 +218,7 @@ typedef enum tagWMAC_POWER_MODE { | |||
218 | 218 | ||
219 | 219 | ||
220 | 220 | ||
221 | // Tx Managment Packet descriptor | 221 | // Tx Management Packet descriptor |
222 | typedef struct tagSTxMgmtPacket { | 222 | typedef struct tagSTxMgmtPacket { |
223 | 223 | ||
224 | PUWLAN_80211HDR p80211Header; | 224 | PUWLAN_80211HDR p80211Header; |
@@ -228,7 +228,7 @@ typedef struct tagSTxMgmtPacket { | |||
228 | } STxMgmtPacket, *PSTxMgmtPacket; | 228 | } STxMgmtPacket, *PSTxMgmtPacket; |
229 | 229 | ||
230 | 230 | ||
231 | // Rx Managment Packet descriptor | 231 | // Rx Management Packet descriptor |
232 | typedef struct tagSRxMgmtPacket { | 232 | typedef struct tagSRxMgmtPacket { |
233 | 233 | ||
234 | PUWLAN_80211HDR p80211Header; | 234 | PUWLAN_80211HDR p80211Header; |
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasdma.c b/drivers/staging/westbridge/astoria/api/src/cyasdma.c index 16b8ec124510..c461d4f60bfb 100644 --- a/drivers/staging/westbridge/astoria/api/src/cyasdma.c +++ b/drivers/staging/westbridge/astoria/api/src/cyasdma.c | |||
@@ -1082,7 +1082,7 @@ cy_as_dma_received_data(cy_as_device *dev_p, | |||
1082 | /* | 1082 | /* |
1083 | * if the data received exceeds the size of the DMA buffer, | 1083 | * if the data received exceeds the size of the DMA buffer, |
1084 | * clip the data to the size of the buffer. this can lead | 1084 | * clip the data to the size of the buffer. this can lead |
1085 | * to loosing some data, but is not different than doing | 1085 | * to losing some data, but is not different than doing |
1086 | * non-packet reads on the other endpoints. | 1086 | * non-packet reads on the other endpoints. |
1087 | */ | 1087 | */ |
1088 | if (dsize > dma_p->size - dma_p->offset) | 1088 | if (dsize > dma_p->size - dma_p->offset) |
diff --git a/drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c b/drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c index 60b6f3525332..76821e51b817 100644 --- a/drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c +++ b/drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c | |||
@@ -126,7 +126,7 @@ find_endpoint_directions(cy_as_device *dev_p, | |||
126 | cy_as_physical_endpoint_state desired; | 126 | cy_as_physical_endpoint_state desired; |
127 | 127 | ||
128 | /* | 128 | /* |
129 | * note, there is no error checking here becuase | 129 | * note, there is no error checking here because |
130 | * ISO error checking happens when the API is called. | 130 | * ISO error checking happens when the API is called. |
131 | */ | 131 | */ |
132 | for (i = 0; i < 10; i++) { | 132 | for (i = 0; i < 10; i++) { |
diff --git a/drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c b/drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c index d43dd858de58..96a86d088305 100644 --- a/drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c +++ b/drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c | |||
@@ -432,7 +432,7 @@ cy_as_mail_box_queued_data_handler(cy_as_device *dev_p) | |||
432 | * is received. When a complete request is received, the callback | 432 | * is received. When a complete request is received, the callback |
433 | * associated with requests on that context is called. When a complete | 433 | * associated with requests on that context is called. When a complete |
434 | * response is recevied, the callback associated with the request that | 434 | * response is recevied, the callback associated with the request that |
435 | * generated the reponse is called. | 435 | * generated the response is called. |
436 | */ | 436 | */ |
437 | void | 437 | void |
438 | cy_as_mail_box_interrupt_handler(cy_as_device *dev_p) | 438 | cy_as_mail_box_interrupt_handler(cy_as_device *dev_p) |
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasmisc.c b/drivers/staging/westbridge/astoria/api/src/cyasmisc.c index 7852410b0a4c..4564fc11df22 100644 --- a/drivers/staging/westbridge/astoria/api/src/cyasmisc.c +++ b/drivers/staging/westbridge/astoria/api/src/cyasmisc.c | |||
@@ -428,7 +428,7 @@ my_misc_callback(cy_as_device *dev_p, uint8_t context, | |||
428 | if (v & CY_AS_MEM_P0_VM_SET_CFGMODE) | 428 | if (v & CY_AS_MEM_P0_VM_SET_CFGMODE) |
429 | cy_as_hal_print_message( | 429 | cy_as_hal_print_message( |
430 | "initialization message " | 430 | "initialization message " |
431 | "recieved, but config bit " | 431 | "received, but config bit " |
432 | "still set\n"); | 432 | "still set\n"); |
433 | 433 | ||
434 | v = cy_as_hal_read_register(dev_p->tag, | 434 | v = cy_as_hal_read_register(dev_p->tag, |
@@ -436,7 +436,7 @@ my_misc_callback(cy_as_device *dev_p, uint8_t context, | |||
436 | if ((v & CY_AS_MEM_RST_RSTCMPT) == 0) | 436 | if ((v & CY_AS_MEM_RST_RSTCMPT) == 0) |
437 | cy_as_hal_print_message( | 437 | cy_as_hal_print_message( |
438 | "initialization message " | 438 | "initialization message " |
439 | "recieved, but reset complete " | 439 | "received, but reset complete " |
440 | "bit still not set\n"); | 440 | "bit still not set\n"); |
441 | } | 441 | } |
442 | break; | 442 | break; |
@@ -2381,7 +2381,7 @@ try_wakeup_again: | |||
2381 | /* | 2381 | /* |
2382 | * release the west bridge micro-_controller from reset, | 2382 | * release the west bridge micro-_controller from reset, |
2383 | * so that firmware initialization can complete. the attempt | 2383 | * so that firmware initialization can complete. the attempt |
2384 | * to release antioch reset is made upto 8 times. | 2384 | * to release antioch reset is made up to 8 times. |
2385 | */ | 2385 | */ |
2386 | v = 0x03; | 2386 | v = 0x03; |
2387 | count = 0x08; | 2387 | count = 0x08; |
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasmtp.c b/drivers/staging/westbridge/astoria/api/src/cyasmtp.c index 368984633874..8598364f7ab7 100644 --- a/drivers/staging/westbridge/astoria/api/src/cyasmtp.c +++ b/drivers/staging/westbridge/astoria/api/src/cyasmtp.c | |||
@@ -346,7 +346,7 @@ cy_as_mtp_start(cy_as_device_handle handle, | |||
346 | 346 | ||
347 | dev_p->mtp_event_cb = event_c_b; | 347 | dev_p->mtp_event_cb = event_c_b; |
348 | /* | 348 | /* |
349 | * we register here becuase the start request may cause | 349 | * we register here because the start request may cause |
350 | * events to occur before the response to the start request. | 350 | * events to occur before the response to the start request. |
351 | */ | 351 | */ |
352 | cy_as_ll_register_request_callback(dev_p, | 352 | cy_as_ll_register_request_callback(dev_p, |
@@ -424,7 +424,7 @@ my_handle_response_mtp_stop(cy_as_device *dev_p, | |||
424 | goto destroy; | 424 | goto destroy; |
425 | 425 | ||
426 | /* | 426 | /* |
427 | * we sucessfully shutdown the stack, so decrement | 427 | * we successfully shutdown the stack, so decrement |
428 | * to make the count zero. | 428 | * to make the count zero. |
429 | */ | 429 | */ |
430 | dev_p->mtp_count--; | 430 | dev_p->mtp_count--; |
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasstorage.c b/drivers/staging/westbridge/astoria/api/src/cyasstorage.c index 2451404b88d4..7abd6a35e828 100644 --- a/drivers/staging/westbridge/astoria/api/src/cyasstorage.c +++ b/drivers/staging/westbridge/astoria/api/src/cyasstorage.c | |||
@@ -1773,7 +1773,7 @@ cy_as_storage_async_oper(cy_as_device *dev_p, cy_as_end_point_number_t ep, | |||
1773 | if (unit > 255) | 1773 | if (unit > 255) |
1774 | return CY_AS_ERROR_NO_SUCH_UNIT; | 1774 | return CY_AS_ERROR_NO_SUCH_UNIT; |
1775 | 1775 | ||
1776 | /* We are supposed to return sucess if the number of | 1776 | /* We are supposed to return success if the number of |
1777 | * blocks is zero | 1777 | * blocks is zero |
1778 | */ | 1778 | */ |
1779 | if (num_blocks == 0) { | 1779 | if (num_blocks == 0) { |
@@ -1969,7 +1969,7 @@ cy_as_storage_sync_oper(cy_as_device *dev_p, | |||
1969 | if (cy_as_device_is_usb_async_pending(dev_p, 6)) | 1969 | if (cy_as_device_is_usb_async_pending(dev_p, 6)) |
1970 | return CY_AS_ERROR_ASYNC_PENDING; | 1970 | return CY_AS_ERROR_ASYNC_PENDING; |
1971 | 1971 | ||
1972 | /* We are supposed to return sucess if the number of | 1972 | /* We are supposed to return success if the number of |
1973 | * blocks is zero | 1973 | * blocks is zero |
1974 | */ | 1974 | */ |
1975 | if (num_blocks == 0) | 1975 | if (num_blocks == 0) |
@@ -3285,7 +3285,7 @@ cy_as_sdio_extended_i_o_async( | |||
3285 | if (callback == 0) | 3285 | if (callback == 0) |
3286 | return CY_AS_ERROR_NULL_CALLBACK; | 3286 | return CY_AS_ERROR_NULL_CALLBACK; |
3287 | 3287 | ||
3288 | /* We are supposed to return sucess if the number of | 3288 | /* We are supposed to return success if the number of |
3289 | * blocks is zero | 3289 | * blocks is zero |
3290 | */ | 3290 | */ |
3291 | if (((misc_buf&CY_SDIO_BLOCKMODE) != 0) && (argument == 0)) { | 3291 | if (((misc_buf&CY_SDIO_BLOCKMODE) != 0) && (argument == 0)) { |
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasusb.c b/drivers/staging/westbridge/astoria/api/src/cyasusb.c index 92ea42503bf3..1b55e611191e 100644 --- a/drivers/staging/westbridge/astoria/api/src/cyasusb.c +++ b/drivers/staging/westbridge/astoria/api/src/cyasusb.c | |||
@@ -739,7 +739,7 @@ cy_as_usb_start(cy_as_device_handle handle, | |||
739 | cy_as_usb_reset_e_p0_state(dev_p); | 739 | cy_as_usb_reset_e_p0_state(dev_p); |
740 | 740 | ||
741 | /* | 741 | /* |
742 | * we register here becuase the start request may cause | 742 | * we register here because the start request may cause |
743 | * events to occur before the response to the start request. | 743 | * events to occur before the response to the start request. |
744 | */ | 744 | */ |
745 | cy_as_ll_register_request_callback(dev_p, | 745 | cy_as_ll_register_request_callback(dev_p, |
@@ -867,7 +867,7 @@ my_handle_response_usb_stop(cy_as_device *dev_p, | |||
867 | goto destroy; | 867 | goto destroy; |
868 | 868 | ||
869 | /* | 869 | /* |
870 | * we sucessfully shutdown the stack, so | 870 | * we successfully shutdown the stack, so |
871 | * decrement to make the count zero. | 871 | * decrement to make the count zero. |
872 | */ | 872 | */ |
873 | cy_as_usb_cleanup(dev_p); | 873 | cy_as_usb_cleanup(dev_p); |
diff --git a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c index 21cdb0637beb..3bcedce13f4a 100644 --- a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c +++ b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c | |||
@@ -87,7 +87,7 @@ | |||
87 | 87 | ||
88 | 88 | ||
89 | /* | 89 | /* |
90 | * For performance reasons, we handle storage endpoint transfers upto 4 KB | 90 | * For performance reasons, we handle storage endpoint transfers up to 4 KB |
91 | * within the HAL itself. | 91 | * within the HAL itself. |
92 | */ | 92 | */ |
93 | #define CYASSTORAGE_WRITE_EP_NUM (4) | 93 | #define CYASSTORAGE_WRITE_EP_NUM (4) |
@@ -108,12 +108,12 @@ | |||
108 | ((ep) == 6) || ((ep) == 8)) | 108 | ((ep) == 6) || ((ep) == 8)) |
109 | 109 | ||
110 | /* | 110 | /* |
111 | * persistant, stores current GPMC interface cfg mode | 111 | * persistent, stores current GPMC interface cfg mode |
112 | */ | 112 | */ |
113 | static uint8_t pnand_16bit; | 113 | static uint8_t pnand_16bit; |
114 | 114 | ||
115 | /* | 115 | /* |
116 | * keep processing new WB DRQ in ISR untill all handled (performance feature) | 116 | * keep processing new WB DRQ in ISR until all handled (performance feature) |
117 | */ | 117 | */ |
118 | #define PROCESS_MULTIPLE_DRQ_IN_ISR (1) | 118 | #define PROCESS_MULTIPLE_DRQ_IN_ISR (1) |
119 | 119 | ||
@@ -157,7 +157,7 @@ typedef struct cy_as_hal_endpoint_dma { | |||
157 | * dma_xfer_sz - size of the next dma xfer on P port | 157 | * dma_xfer_sz - size of the next dma xfer on P port |
158 | * seg_xfer_cnt - counts xfered bytes for in current sg_list | 158 | * seg_xfer_cnt - counts xfered bytes for in current sg_list |
159 | * memory segment | 159 | * memory segment |
160 | * req_xfer_cnt - total number of bytes transfered so far in | 160 | * req_xfer_cnt - total number of bytes transferred so far in |
161 | * current request | 161 | * current request |
162 | * req_length - total request length | 162 | * req_length - total request length |
163 | */ | 163 | */ |
@@ -2160,7 +2160,7 @@ void cy_as_hal_mem_set(void *ptr, uint8_t value, uint32_t cnt) | |||
2160 | /* | 2160 | /* |
2161 | * This function is expected to create a sleep channel. | 2161 | * This function is expected to create a sleep channel. |
2162 | * The data structure that represents the sleep channel object | 2162 | * The data structure that represents the sleep channel object |
2163 | * sleep channel (which is Linux "wait_queue_head_t wq" for this paticular HAL) | 2163 | * sleep channel (which is Linux "wait_queue_head_t wq" for this particular HAL) |
2164 | * passed as a pointer, and allpocated by the caller | 2164 | * passed as a pointer, and allpocated by the caller |
2165 | * (typically as a local var on the stack) "Create" word should read as | 2165 | * (typically as a local var on the stack) "Create" word should read as |
2166 | * "SleepOn", this func doesn't actually create anything | 2166 | * "SleepOn", this func doesn't actually create anything |
@@ -2364,7 +2364,7 @@ int start_o_m_a_p_kernel(const char *pgm, | |||
2364 | */ | 2364 | */ |
2365 | cy_as_hal_gpmc_enable_16bit_bus(cy_true); | 2365 | cy_as_hal_gpmc_enable_16bit_bus(cy_true); |
2366 | #else | 2366 | #else |
2367 | /* Astoria and GPMC are already in 8 bit mode, jsut initialize PNAND_CFG */ | 2367 | /* Astoria and GPMC are already in 8 bit mode, just initialize PNAND_CFG */ |
2368 | ast_p_nand_casdi_write(CY_AS_MEM_PNAND_CFG, 0x0000); | 2368 | ast_p_nand_casdi_write(CY_AS_MEM_PNAND_CFG, 0x0000); |
2369 | #endif | 2369 | #endif |
2370 | 2370 | ||
diff --git a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h index 80dd530bc4fd..6426ea61f3d4 100644 --- a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h +++ b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h | |||
@@ -20,7 +20,7 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | /* | 22 | /* |
23 | * This file contains the defintion of the hardware abstraction | 23 | * This file contains the definition of the hardware abstraction |
24 | * layer on OMAP3430 talking to the West Bridge Astoria device | 24 | * layer on OMAP3430 talking to the West Bridge Astoria device |
25 | */ | 25 | */ |
26 | 26 | ||
diff --git a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h index 3eee192ffe89..46f06ee29357 100644 --- a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h +++ b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h | |||
@@ -51,7 +51,7 @@ | |||
51 | * GPMC_ADDR | 51 | * GPMC_ADDR |
52 | * [A8:A1]->upD[7:0] | 52 | * [A8:A1]->upD[7:0] |
53 | * INT# -GPMC_nWP_GPIO_62 | 53 | * INT# -GPMC_nWP_GPIO_62 |
54 | * DACK -N/C not conected | 54 | * DACK -N/C not connected |
55 | * WAKEUP-GPIO_167 | 55 | * WAKEUP-GPIO_167 |
56 | * RESET-GPIO_126 | 56 | * RESET-GPIO_126 |
57 | * R/B -GPMC_WAIT2_GPIO_64 | 57 | * R/B -GPMC_WAIT2_GPIO_64 |
@@ -108,7 +108,7 @@ | |||
108 | * will be monitored | 108 | * will be monitored |
109 | * PF_EN_ENGINE - 1- ENABLES ENGINE, but it needs to be started after | 109 | * PF_EN_ENGINE - 1- ENABLES ENGINE, but it needs to be started after |
110 | * that C ctrl reg bit 0 | 110 | * that C ctrl reg bit 0 |
111 | * PF_FIFO_THRESHOLD - FIFO threshhold in number of BUS(8 or 16) words | 111 | * PF_FIFO_THRESHOLD - FIFO threshold in number of BUS(8 or 16) words |
112 | * PF_WEIGHTED_PRIO - NUM of cycles granted to PFE if RND_ROBIN | 112 | * PF_WEIGHTED_PRIO - NUM of cycles granted to PFE if RND_ROBIN |
113 | * prioritization is enabled | 113 | * prioritization is enabled |
114 | * PF_ROUND_ROBIN - if enabled, gives priority to other CS, but | 114 | * PF_ROUND_ROBIN - if enabled, gives priority to other CS, but |
diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c index 0bbb8a3e191d..d1996a27515e 100644 --- a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c +++ b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c | |||
@@ -222,7 +222,7 @@ static int cyasblkdev_queue_thread(void *d) | |||
222 | continue; | 222 | continue; |
223 | } | 223 | } |
224 | 224 | ||
225 | /* new req recieved, issue it to the driver */ | 225 | /* new req received, issue it to the driver */ |
226 | set_current_state(TASK_RUNNING); | 226 | set_current_state(TASK_RUNNING); |
227 | 227 | ||
228 | #ifndef WESTBRIDGE_NDEBUG | 228 | #ifndef WESTBRIDGE_NDEBUG |
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h index 0c0726b678ad..6452a9070091 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h | |||
@@ -119,7 +119,7 @@ | |||
119 | #define CY_AS_REQUEST_LIST_STATE_QUEUED (0x00) | 119 | #define CY_AS_REQUEST_LIST_STATE_QUEUED (0x00) |
120 | /* The request is sent, waiting for response */ | 120 | /* The request is sent, waiting for response */ |
121 | #define CY_AS_REQUEST_LIST_STATE_WAITING (0x01) | 121 | #define CY_AS_REQUEST_LIST_STATE_WAITING (0x01) |
122 | /* The response has been received, processing reponse */ | 122 | /* The response has been received, processing response */ |
123 | #define CY_AS_REQUEST_LIST_STATE_RECEIVED (0x02) | 123 | #define CY_AS_REQUEST_LIST_STATE_RECEIVED (0x02) |
124 | /* The request/response is being canceled */ | 124 | /* The request/response is being canceled */ |
125 | #define CY_AS_REQUEST_LIST_STATE_CANCELING (0x03) | 125 | #define CY_AS_REQUEST_LIST_STATE_CANCELING (0x03) |
@@ -517,7 +517,7 @@ typedef struct cy_as_context { | |||
517 | cy_as_ll_request_list_node *request_queue_p; | 517 | cy_as_ll_request_list_node *request_queue_p; |
518 | /* The list node in the request queue */ | 518 | /* The list node in the request queue */ |
519 | cy_as_ll_request_list_node *last_node_p; | 519 | cy_as_ll_request_list_node *last_node_p; |
520 | /* Index upto which data is stored. */ | 520 | /* Index up to which data is stored. */ |
521 | uint16_t queue_index; | 521 | uint16_t queue_index; |
522 | /* Index to the next request in the queue. */ | 522 | /* Index to the next request in the queue. */ |
523 | uint16_t rqt_index; | 523 | uint16_t rqt_index; |
@@ -768,7 +768,7 @@ struct cy_as_device { | |||
768 | uint32_t mtp_count; | 768 | uint32_t mtp_count; |
769 | /* The MTP event callback supplied by the client */ | 769 | /* The MTP event callback supplied by the client */ |
770 | cy_as_mtp_event_callback mtp_event_cb; | 770 | cy_as_mtp_event_callback mtp_event_cb; |
771 | /* The current block table to be transfered */ | 771 | /* The current block table to be transferred */ |
772 | cy_as_mtp_block_table *tp_blk_tbl; | 772 | cy_as_mtp_block_table *tp_blk_tbl; |
773 | 773 | ||
774 | cy_as_c_b_queue *func_cbs_mtp; | 774 | cy_as_c_b_queue *func_cbs_mtp; |
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h index 8dab5e900149..16dc9f96018c 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h | |||
@@ -108,7 +108,7 @@ typedef enum cy_as_dma_direction { | |||
108 | completes a requested DMA operation. | 108 | completes a requested DMA operation. |
109 | 109 | ||
110 | Returns | 110 | Returns |
111 | CY_AS_ERROR_SUCCESS - the module initialized sucessfully | 111 | CY_AS_ERROR_SUCCESS - the module initialized successfully |
112 | CY_AS_ERROR_OUT_OF_MEMORY - memory allocation failed during | 112 | CY_AS_ERROR_OUT_OF_MEMORY - memory allocation failed during |
113 | initialization | 113 | initialization |
114 | CY_AS_ERROR_ALREADY_RUNNING - the DMA module was already running | 114 | CY_AS_ERROR_ALREADY_RUNNING - the DMA module was already running |
@@ -131,7 +131,7 @@ cy_as_dma_start( | |||
131 | then freeing the resources associated with each DMA endpoint. | 131 | then freeing the resources associated with each DMA endpoint. |
132 | 132 | ||
133 | Returns | 133 | Returns |
134 | CY_AS_ERROR_SUCCESS - the module shutdown sucessfully | 134 | CY_AS_ERROR_SUCCESS - the module shutdown successfully |
135 | CY_AS_ERROR_NOT_RUNNING - the DMA module was not running | 135 | CY_AS_ERROR_NOT_RUNNING - the DMA module was not running |
136 | 136 | ||
137 | See Also | 137 | See Also |
@@ -161,7 +161,7 @@ cy_as_dma_stop( | |||
161 | 161 | ||
162 | Returns | 162 | Returns |
163 | CY_AS_ERROR_SUCCESS - the traffic on the endpoint is canceled | 163 | CY_AS_ERROR_SUCCESS - the traffic on the endpoint is canceled |
164 | sucessfully | 164 | successfully |
165 | 165 | ||
166 | See Also | 166 | See Also |
167 | */ | 167 | */ |
@@ -266,7 +266,7 @@ cy_as_dma_queue_request( | |||
266 | will have to maintain a list of sleep channels to wake. | 266 | will have to maintain a list of sleep channels to wake. |
267 | 267 | ||
268 | Returns | 268 | Returns |
269 | * CY_AS_ERROR_SUCCESS - the queue has drained sucessfully | 269 | * CY_AS_ERROR_SUCCESS - the queue has drained successfully |
270 | * CY_AS_ERROR_INVALID_ENDPOINT - the endpoint given is not valid | 270 | * CY_AS_ERROR_INVALID_ENDPOINT - the endpoint given is not valid |
271 | * CY_AS_ERROR_NESTED_SLEEP - CyAsDmaQueueRequest() was requested | 271 | * CY_AS_ERROR_NESTED_SLEEP - CyAsDmaQueueRequest() was requested |
272 | * on an endpoint where CyAsDmaQueueRequest was already called | 272 | * on an endpoint where CyAsDmaQueueRequest was already called |
@@ -295,7 +295,7 @@ cy_as_dma_drain_queue( | |||
295 | CyAsHalDmaSetupRead() functoins. | 295 | CyAsHalDmaSetupRead() functoins. |
296 | 296 | ||
297 | Returns | 297 | Returns |
298 | * CY_AS_ERROR_SUCCESS - the value was set sucessfully | 298 | * CY_AS_ERROR_SUCCESS - the value was set successfully |
299 | * CY_AS_ERROR_INVALID_SIZE - the size value was not valid | 299 | * CY_AS_ERROR_INVALID_SIZE - the size value was not valid |
300 | */ | 300 | */ |
301 | extern cy_as_return_status_t | 301 | extern cy_as_return_status_t |
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h index f78d60270d45..2cd0af1ed781 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h | |||
@@ -29,7 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | /* Summary | 31 | /* Summary |
32 | The function completed sucessfully | 32 | The function completed successfully |
33 | */ | 33 | */ |
34 | #define CY_AS_ERROR_SUCCESS (0) | 34 | #define CY_AS_ERROR_SUCCESS (0) |
35 | 35 | ||
@@ -796,7 +796,7 @@ | |||
796 | Description | 796 | Description |
797 | This error is returned when an operation is attempted that cannot be | 797 | This error is returned when an operation is attempted that cannot be |
798 | completed while the USB stack is connected to a USB host. In order | 798 | completed while the USB stack is connected to a USB host. In order |
799 | to sucessfully complete the desired operation, CyAsUsbDisconnect() | 799 | to successfully complete the desired operation, CyAsUsbDisconnect() |
800 | must be called to disconnect from the host. | 800 | must be called to disconnect from the host. |
801 | */ | 801 | */ |
802 | #define CY_AS_ERROR_USB_CONNECTED (53) | 802 | #define CY_AS_ERROR_USB_CONNECTED (53) |
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h index 28136ad75115..5bcbe9bf2f5d 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h | |||
@@ -597,7 +597,7 @@ cy_as_mem_set( | |||
597 | CyAsHalSleepChannel. | 597 | CyAsHalSleepChannel. |
598 | 598 | ||
599 | Returns | 599 | Returns |
600 | CyTrue is the initialization was sucessful, and CyFalse otherwise | 600 | CyTrue is the initialization was successful, and CyFalse otherwise |
601 | 601 | ||
602 | See Also | 602 | See Also |
603 | * CyAsHalSleepChannel | 603 | * CyAsHalSleepChannel |
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h index 3d7063ea3093..60a6fffb5d53 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h | |||
@@ -69,7 +69,7 @@ cy_as_intr_start( | |||
69 | 69 | ||
70 | Returns | 70 | Returns |
71 | * CY_AS_ERROR_SUCCESS - the interrupt module was stopped | 71 | * CY_AS_ERROR_SUCCESS - the interrupt module was stopped |
72 | * sucessfully | 72 | * successfully |
73 | * CY_AS_ERROR_NOT_RUNNING - the interrupt module was not | 73 | * CY_AS_ERROR_NOT_RUNNING - the interrupt module was not |
74 | * running | 74 | * running |
75 | 75 | ||
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h index 2f0701850561..df7c2b66cf27 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h | |||
@@ -620,7 +620,7 @@ cy_as_misc_in_standby( | |||
620 | * Nestable: YES | 620 | * Nestable: YES |
621 | 621 | ||
622 | Returns | 622 | Returns |
623 | * CY_AS_ERROR_SUCCESS - the firmware was sucessfully downloaded | 623 | * CY_AS_ERROR_SUCCESS - the firmware was successfully downloaded |
624 | * CY_AS_ERROR_INVALID_HANDLE | 624 | * CY_AS_ERROR_INVALID_HANDLE |
625 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device | 625 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device |
626 | * was not configured | 626 | * was not configured |
@@ -836,7 +836,7 @@ cy_as_misc_reset( | |||
836 | ownership. | 836 | ownership. |
837 | 837 | ||
838 | Returns | 838 | Returns |
839 | * CY_AS_ERROR_SUCCESS - the p port sucessfully acquired the | 839 | * CY_AS_ERROR_SUCCESS - the p port successfully acquired the |
840 | * resource of interest | 840 | * resource of interest |
841 | * CY_AS_ERROR_INVALID_HANDLE | 841 | * CY_AS_ERROR_INVALID_HANDLE |
842 | * CY_AS_ERROR_NOT_CONFIGURED | 842 | * CY_AS_ERROR_NOT_CONFIGURED |
@@ -879,7 +879,7 @@ cy_as_misc_acquire_resource( | |||
879 | * Valid In Asynchronous Callback: NO | 879 | * Valid In Asynchronous Callback: NO |
880 | 880 | ||
881 | Returns | 881 | Returns |
882 | * CY_AS_ERROR_SUCCESS - the p port sucessfully released | 882 | * CY_AS_ERROR_SUCCESS - the p port successfully released |
883 | * the resource of interest | 883 | * the resource of interest |
884 | * CY_AS_ERROR_INVALID_HANDLE | 884 | * CY_AS_ERROR_INVALID_HANDLE |
885 | * CY_AS_ERROR_NOT_CONFIGURED | 885 | * CY_AS_ERROR_NOT_CONFIGURED |
@@ -929,7 +929,7 @@ cy_as_misc_release_resource( | |||
929 | 929 | ||
930 | Returns | 930 | Returns |
931 | * CY_AS_ERROR_SUCCESS - the trace configuration has been | 931 | * CY_AS_ERROR_SUCCESS - the trace configuration has been |
932 | * sucessfully changed | 932 | * successfully changed |
933 | * CY_AS_ERROR_NO_SUCH_BUS - the bus specified does not exist | 933 | * CY_AS_ERROR_NO_SUCH_BUS - the bus specified does not exist |
934 | * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device | 934 | * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device |
935 | * pair does not exist | 935 | * pair does not exist |
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h index 317805fc4ff4..773b645ea7eb 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h | |||
@@ -756,7 +756,7 @@ | |||
756 | * 1 : Debug mode | 756 | * 1 : Debug mode |
757 | 757 | ||
758 | Description | 758 | Description |
759 | This reponse is sent to return the firmware version | 759 | This response is sent to return the firmware version |
760 | number to the requestor. | 760 | number to the requestor. |
761 | */ | 761 | */ |
762 | #define CY_RESP_FIRMWARE_VERSION (16) | 762 | #define CY_RESP_FIRMWARE_VERSION (16) |
@@ -3655,7 +3655,7 @@ | |||
3655 | This request is sent to the West Bridge when the P port | 3655 | This request is sent to the West Bridge when the P port |
3656 | needs to send data to the Host in a Turbo Endpoint. | 3656 | needs to send data to the Host in a Turbo Endpoint. |
3657 | Upon receiving this event, Firmware will make the end point | 3657 | Upon receiving this event, Firmware will make the end point |
3658 | avilable for the P port. If the length is zero, then | 3658 | available for the P port. If the length is zero, then |
3659 | firmware will send a zero length packet. | 3659 | firmware will send a zero length packet. |
3660 | 3660 | ||
3661 | Direction | 3661 | Direction |
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h index 64f078cf202c..52b93c3e4813 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h | |||
@@ -832,7 +832,7 @@ typedef struct cy_as_sdio_func { | |||
832 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been | 832 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been |
833 | * loaded into West Bridge | 833 | * loaded into West Bridge |
834 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was passed in | 834 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was passed in |
835 | * CY_AS_ERROR_SUCCESS - the module started sucessfully | 835 | * CY_AS_ERROR_SUCCESS - the module started successfully |
836 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating | 836 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating |
837 | * with the West Bridge device | 837 | * with the West Bridge device |
838 | * CY_AS_ERROR_OUT_OF_MEMORY | 838 | * CY_AS_ERROR_OUT_OF_MEMORY |
@@ -882,7 +882,7 @@ cy_as_storage_start( | |||
882 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was | 882 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was |
883 | * passed in | 883 | * passed in |
884 | * CY_AS_ERROR_SUCCESS - this module was shut | 884 | * CY_AS_ERROR_SUCCESS - this module was shut |
885 | * down sucessfully | 885 | * down successfully |
886 | * CY_AS_ERROR_TIMEOUT - a timeout occurred | 886 | * CY_AS_ERROR_TIMEOUT - a timeout occurred |
887 | * communicating with the West Bridge device | 887 | * communicating with the West Bridge device |
888 | * CY_AS_ERROR_NOT_RUNNING | 888 | * CY_AS_ERROR_NOT_RUNNING |
@@ -934,7 +934,7 @@ cy_as_storage_stop( | |||
934 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle | 934 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle |
935 | * was passed in | 935 | * was passed in |
936 | * CY_AS_ERROR_SUCCESS - the function was registered | 936 | * CY_AS_ERROR_SUCCESS - the function was registered |
937 | * sucessfully | 937 | * successfully |
938 | * CY_AS_ERROR_NOT_RUNNING - the stack is not running | 938 | * CY_AS_ERROR_NOT_RUNNING - the stack is not running |
939 | 939 | ||
940 | See Also | 940 | See Also |
@@ -981,7 +981,7 @@ cy_as_storage_register_callback( | |||
981 | * been started | 981 | * been started |
982 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was | 982 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was |
983 | * passed in | 983 | * passed in |
984 | * CY_AS_ERROR_SUCCESS - this request was sucessfully | 984 | * CY_AS_ERROR_SUCCESS - this request was successfully |
985 | * transmitted to the West Bridge device | 985 | * transmitted to the West Bridge device |
986 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating | 986 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating |
987 | * with the West Bridge device | 987 | * with the West Bridge device |
@@ -1034,7 +1034,7 @@ cy_as_storage_claim( | |||
1034 | * been started | 1034 | * been started |
1035 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle | 1035 | * CY_AS_ERROR_INVALID_HANDLE - an invalid handle |
1036 | * was passed in | 1036 | * was passed in |
1037 | * CY_AS_ERROR_SUCCESS - the media was sucessfully | 1037 | * CY_AS_ERROR_SUCCESS - the media was successfully |
1038 | * released | 1038 | * released |
1039 | * CY_AS_ERROR_MEDIA_NOT_CLAIMED - the media was not | 1039 | * CY_AS_ERROR_MEDIA_NOT_CLAIMED - the media was not |
1040 | * claimed by the P port | 1040 | * claimed by the P port |
@@ -1905,7 +1905,7 @@ cy_as_storage_get_transfer_amount( | |||
1905 | differ between SD cards. | 1905 | differ between SD cards. |
1906 | 1906 | ||
1907 | A large erase can take a while to complete depending on the SD | 1907 | A large erase can take a while to complete depending on the SD |
1908 | card. In such a case it is reccomended that an async call is made. | 1908 | card. In such a case it is recommended that an async call is made. |
1909 | 1909 | ||
1910 | Returns | 1910 | Returns |
1911 | * CY_AS_ERROR_SUCCESS - API call completed successfully | 1911 | * CY_AS_ERROR_SUCCESS - API call completed successfully |
@@ -1926,7 +1926,7 @@ cy_as_storage_get_transfer_amount( | |||
1926 | * required before erase is allowed | 1926 | * required before erase is allowed |
1927 | * CY_AS_ERROR_NO_SUCH_BUS | 1927 | * CY_AS_ERROR_NO_SUCH_BUS |
1928 | * CY_AS_ERROR_NO_SUCH_DEVICE | 1928 | * CY_AS_ERROR_NO_SUCH_DEVICE |
1929 | * CY_AS_ERROR_NOT_SUPPORTED - Erase is currenly only supported | 1929 | * CY_AS_ERROR_NOT_SUPPORTED - Erase is currently only supported |
1930 | * on SD and using SD only firmware | 1930 | * on SD and using SD only firmware |
1931 | * CY_AS_ERROR_OUT_OF_MEMORY | 1931 | * CY_AS_ERROR_OUT_OF_MEMORY |
1932 | 1932 | ||
@@ -1985,7 +1985,7 @@ cy_as_storage_erase( | |||
1985 | * type was made | 1985 | * type was made |
1986 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available | 1986 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available |
1987 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was | 1987 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was |
1988 | * recieved from the firmware | 1988 | * received from the firmware |
1989 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in | 1989 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in |
1990 | * reading from the media | 1990 | * reading from the media |
1991 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made to | 1991 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made to |
@@ -2047,7 +2047,7 @@ cy_as_sdio_get_c_i_s_info( | |||
2047 | * pair does not exist | 2047 | * pair does not exist |
2048 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available | 2048 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available |
2049 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was | 2049 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was |
2050 | * recieved from the firmware | 2050 | * received from the firmware |
2051 | 2051 | ||
2052 | */ | 2052 | */ |
2053 | cy_as_return_status_t | 2053 | cy_as_return_status_t |
@@ -2095,7 +2095,7 @@ cy_as_sdio_query_card( | |||
2095 | * pair does not exist | 2095 | * pair does not exist |
2096 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available | 2096 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available |
2097 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was | 2097 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was |
2098 | * recieved from the firmware | 2098 | * received from the firmware |
2099 | */ | 2099 | */ |
2100 | cy_as_return_status_t | 2100 | cy_as_return_status_t |
2101 | cy_as_sdio_reset_card( | 2101 | cy_as_sdio_reset_card( |
@@ -2139,7 +2139,7 @@ cy_as_sdio_reset_card( | |||
2139 | * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device pair | 2139 | * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device pair |
2140 | * does not exist | 2140 | * does not exist |
2141 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available | 2141 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available |
2142 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was recieved | 2142 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was received |
2143 | * from the firmware | 2143 | * from the firmware |
2144 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in reading | 2144 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in reading |
2145 | * from the media | 2145 | * from the media |
@@ -2198,7 +2198,7 @@ cy_as_sdio_direct_read( | |||
2198 | * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device | 2198 | * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device |
2199 | * pair does not exist | 2199 | * pair does not exist |
2200 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available | 2200 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available |
2201 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was recieved | 2201 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was received |
2202 | * from the firmware | 2202 | * from the firmware |
2203 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in | 2203 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in |
2204 | * reading from the media | 2204 | * reading from the media |
@@ -2262,7 +2262,7 @@ cy_as_sdio_direct_write( | |||
2262 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory | 2262 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory |
2263 | * available | 2263 | * available |
2264 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was | 2264 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was |
2265 | * recieved from the firmware | 2265 | * received from the firmware |
2266 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in | 2266 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in |
2267 | * reading from the media | 2267 | * reading from the media |
2268 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made | 2268 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made |
@@ -2319,7 +2319,7 @@ cy_as_sdio_set_blocksize( | |||
2319 | * pair does not exist | 2319 | * pair does not exist |
2320 | * CY_AS_ERROR_ASYNC_PENDING - an async operation is pending | 2320 | * CY_AS_ERROR_ASYNC_PENDING - an async operation is pending |
2321 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available | 2321 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available |
2322 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was recieved | 2322 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was received |
2323 | * from the firmware | 2323 | * from the firmware |
2324 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in | 2324 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in |
2325 | * reading from the media | 2325 | * reading from the media |
@@ -2396,7 +2396,7 @@ cy_as_sdio_extended_read( | |||
2396 | * CY_AS_ERROR_ASYNC_PENDING - an async operation is pending | 2396 | * CY_AS_ERROR_ASYNC_PENDING - an async operation is pending |
2397 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available | 2397 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available |
2398 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was | 2398 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was |
2399 | * recieved from the firmware | 2399 | * received from the firmware |
2400 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in | 2400 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in |
2401 | * reading from the media | 2401 | * reading from the media |
2402 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made | 2402 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made |
@@ -2471,7 +2471,7 @@ cy_as_sdio_extended_write( | |||
2471 | * pair does not exist | 2471 | * pair does not exist |
2472 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available | 2472 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available |
2473 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was | 2473 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was |
2474 | * recieved from the firmware | 2474 | * received from the firmware |
2475 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in | 2475 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in |
2476 | * reading from the media | 2476 | * reading from the media |
2477 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made | 2477 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made |
@@ -2714,7 +2714,7 @@ cy_as_sdio_suspend( | |||
2714 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory | 2714 | * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory |
2715 | * available | 2715 | * available |
2716 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was | 2716 | * CY_AS_ERROR_INVALID_RESPONSE - an error message was |
2717 | * recieved from the firmware | 2717 | * received from the firmware |
2718 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error | 2718 | * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error |
2719 | * in reading from the media | 2719 | * in reading from the media |
2720 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was | 2720 | * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was |
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h index 4a549e146812..e3ba9ca4c75f 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h | |||
@@ -464,7 +464,7 @@ typedef struct cy_as_usb_end_point_config { | |||
464 | be selected on a partitioned storage device. | 464 | be selected on a partitioned storage device. |
465 | 465 | ||
466 | Description | 466 | Description |
467 | West Bridge firmware supports creating upto two | 467 | West Bridge firmware supports creating up to two |
468 | partitions on mass storage devices connected to | 468 | partitions on mass storage devices connected to |
469 | West Bridge. When there are two partitions on a device, | 469 | West Bridge. When there are two partitions on a device, |
470 | the user can choose which of these partitions should be | 470 | the user can choose which of these partitions should be |
@@ -698,7 +698,7 @@ cy_as_usb_start( | |||
698 | * been configured | 698 | * been configured |
699 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 699 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
700 | * into West Bridge | 700 | * into West Bridge |
701 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 701 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
702 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with | 702 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with |
703 | * the West Bridge device | 703 | * the West Bridge device |
704 | 704 | ||
@@ -752,7 +752,7 @@ cy_as_usb_register_callback( | |||
752 | * Nestable: YES | 752 | * Nestable: YES |
753 | 753 | ||
754 | Returns | 754 | Returns |
755 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 755 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
756 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not | 756 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not |
757 | * been configured | 757 | * been configured |
758 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 758 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
@@ -791,7 +791,7 @@ cy_as_usb_connect( | |||
791 | * Nestable: YES | 791 | * Nestable: YES |
792 | 792 | ||
793 | Returns | 793 | Returns |
794 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 794 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
795 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not | 795 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not |
796 | * been configured | 796 | * been configured |
797 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 797 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
@@ -825,7 +825,7 @@ cy_as_usb_disconnect( | |||
825 | * Valid In Asynchronous Callback: Yes (if cb supplied) | 825 | * Valid In Asynchronous Callback: Yes (if cb supplied) |
826 | 826 | ||
827 | Returns | 827 | Returns |
828 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 828 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
829 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not | 829 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not |
830 | * been configured | 830 | * been configured |
831 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 831 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
@@ -855,13 +855,13 @@ cy_as_usb_set_enum_config( | |||
855 | the USB stack | 855 | the USB stack |
856 | 856 | ||
857 | Description | 857 | Description |
858 | This function sends a request to West Bridge to retreive | 858 | This function sends a request to West Bridge to retrieve |
859 | the current configuration | 859 | the current configuration |
860 | 860 | ||
861 | * Valid In Asynchronous Callback: Yes (if cb supplied) | 861 | * Valid In Asynchronous Callback: Yes (if cb supplied) |
862 | 862 | ||
863 | Returns | 863 | Returns |
864 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 864 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
865 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not | 865 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not |
866 | * been configured | 866 | * been configured |
867 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 867 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
@@ -906,7 +906,7 @@ cy_as_usb_get_enum_config( | |||
906 | Chapter 9. | 906 | Chapter 9. |
907 | 907 | ||
908 | Returns | 908 | Returns |
909 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 909 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
910 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not | 910 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not |
911 | * been configured | 911 | * been configured |
912 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 912 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
@@ -993,7 +993,7 @@ cy_as_usb_clear_descriptors( | |||
993 | Description | 993 | Description |
994 | This data structure the buffer to hold the descriptor | 994 | This data structure the buffer to hold the descriptor |
995 | data, and an in/out parameter ti indicate the | 995 | data, and an in/out parameter ti indicate the |
996 | lenght of the buffer and descriptor data in bytes. | 996 | length of the buffer and descriptor data in bytes. |
997 | 997 | ||
998 | See Also | 998 | See Also |
999 | * CyAsUsbGetDescriptor | 999 | * CyAsUsbGetDescriptor |
@@ -1027,7 +1027,7 @@ typedef struct cy_as_get_descriptor_data { | |||
1027 | Chapter 9. | 1027 | Chapter 9. |
1028 | 1028 | ||
1029 | Returns | 1029 | Returns |
1030 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 1030 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
1031 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not | 1031 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not |
1032 | * been configured | 1032 | * been configured |
1033 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 1033 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
@@ -1106,7 +1106,7 @@ cy_as_usb_get_descriptor( | |||
1106 | * Valid In Asynchronous Callback: NO | 1106 | * Valid In Asynchronous Callback: NO |
1107 | 1107 | ||
1108 | Returns | 1108 | Returns |
1109 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 1109 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
1110 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not | 1110 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not |
1111 | * been configured | 1111 | * been configured |
1112 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 1112 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
@@ -1140,7 +1140,7 @@ cy_as_usb_set_physical_configuration( | |||
1140 | Add documentation about endpoint configuration limitations | 1140 | Add documentation about endpoint configuration limitations |
1141 | 1141 | ||
1142 | Returns | 1142 | Returns |
1143 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 1143 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
1144 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not | 1144 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not |
1145 | * been configured | 1145 | * been configured |
1146 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 1146 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
@@ -1181,7 +1181,7 @@ cy_as_usb_set_end_point_config( | |||
1181 | * Valid In Asynchronous Callback: NO | 1181 | * Valid In Asynchronous Callback: NO |
1182 | 1182 | ||
1183 | Returns | 1183 | Returns |
1184 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 1184 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
1185 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not | 1185 | * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not |
1186 | * been configured | 1186 | * been configured |
1187 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded | 1187 | * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded |
@@ -1219,7 +1219,7 @@ cy_as_usb_get_end_point_config( | |||
1219 | functions store away the configuration information and this | 1219 | functions store away the configuration information and this |
1220 | CyAsUsbCommitConfig() actually finds the | 1220 | CyAsUsbCommitConfig() actually finds the |
1221 | best hardware configuration based on the requested endpoint | 1221 | best hardware configuration based on the requested endpoint |
1222 | configuration and sends thsi optimal | 1222 | configuration and sends this optimal |
1223 | confiuration down to the West Bridge device. | 1223 | confiuration down to the West Bridge device. |
1224 | 1224 | ||
1225 | * Valid In Asynchronous Callback: YES (if cb supplied) | 1225 | * Valid In Asynchronous Callback: YES (if cb supplied) |
@@ -1268,7 +1268,7 @@ cy_as_usb_commit_config( | |||
1268 | * Valid In Asynchronous Callback: NO | 1268 | * Valid In Asynchronous Callback: NO |
1269 | 1269 | ||
1270 | Returns | 1270 | Returns |
1271 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 1271 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
1272 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with | 1272 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with |
1273 | * the West Bridge device | 1273 | * the West Bridge device |
1274 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running | 1274 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running |
@@ -1311,7 +1311,7 @@ cy_as_usb_read_data( | |||
1311 | * Valid In Asynchronous Callback: YES | 1311 | * Valid In Asynchronous Callback: YES |
1312 | 1312 | ||
1313 | Returns | 1313 | Returns |
1314 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 1314 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
1315 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with | 1315 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with |
1316 | * the West Bridge device | 1316 | * the West Bridge device |
1317 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running | 1317 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running |
@@ -1355,7 +1355,7 @@ cy_as_usb_read_data_async( | |||
1355 | a zero length packet transmitted to the USB host. | 1355 | a zero length packet transmitted to the USB host. |
1356 | 1356 | ||
1357 | Returns | 1357 | Returns |
1358 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 1358 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
1359 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with | 1359 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with |
1360 | * the West Bridge device | 1360 | * the West Bridge device |
1361 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running | 1361 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running |
@@ -1395,7 +1395,7 @@ cy_as_usb_write_data( | |||
1395 | in a zero length packet transmitted to the USB host. | 1395 | in a zero length packet transmitted to the USB host. |
1396 | 1396 | ||
1397 | Returns | 1397 | Returns |
1398 | * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully | 1398 | * CY_AS_ERROR_SUCCESS - this module was shut down successfully |
1399 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with | 1399 | * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with |
1400 | * the West Bridge device | 1400 | * the West Bridge device |
1401 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running | 1401 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running |
@@ -1435,7 +1435,7 @@ cy_as_usb_write_data_async( | |||
1435 | 1435 | ||
1436 | Returns | 1436 | Returns |
1437 | * CY_AS_ERROR_SUCCESS - this module was shut down | 1437 | * CY_AS_ERROR_SUCCESS - this module was shut down |
1438 | * sucessfully | 1438 | * successfully |
1439 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not | 1439 | * CY_AS_ERROR_NOT_RUNNING - the USB stack is not |
1440 | * running | 1440 | * running |
1441 | * CY_AS_ERROR_ASYNC_NOT_PENDING - no asynchronous USB | 1441 | * CY_AS_ERROR_ASYNC_NOT_PENDING - no asynchronous USB |
@@ -1791,7 +1791,7 @@ cy_as_usb_set_m_s_report_threshold( | |||
1791 | device should be made visible to USB. | 1791 | device should be made visible to USB. |
1792 | 1792 | ||
1793 | Description | 1793 | Description |
1794 | West Bridge firmware supports the creation of upto two | 1794 | West Bridge firmware supports the creation of up to two |
1795 | partitions on mass storage devices connected to the West Bridge | 1795 | partitions on mass storage devices connected to the West Bridge |
1796 | device. When there are two partitions on a device, the user can | 1796 | device. When there are two partitions on a device, the user can |
1797 | choose which of these partitions should be made visible to the | 1797 | choose which of these partitions should be made visible to the |
diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c index 9cfea94bcea5..c9f0e8f856a0 100644 --- a/drivers/staging/winbond/mds.c +++ b/drivers/staging/winbond/mds.c | |||
@@ -492,7 +492,7 @@ Mds_Tx(struct wbsoft_priv *adapter) | |||
492 | 492 | ||
493 | TxDesIndex = pMds->TxDesIndex; /* Get the current ID */ | 493 | TxDesIndex = pMds->TxDesIndex; /* Get the current ID */ |
494 | pTxDes->Descriptor_ID = TxDesIndex; | 494 | pTxDes->Descriptor_ID = TxDesIndex; |
495 | pMds->TxDesFrom[TxDesIndex] = 2; /* Storing the information of source comming from */ | 495 | pMds->TxDesFrom[TxDesIndex] = 2; /* Storing the information of source coming from */ |
496 | pMds->TxDesIndex++; | 496 | pMds->TxDesIndex++; |
497 | pMds->TxDesIndex %= MAX_USB_TX_DESCRIPTOR; | 497 | pMds->TxDesIndex %= MAX_USB_TX_DESCRIPTOR; |
498 | 498 | ||
diff --git a/drivers/staging/wlags49_h2/README.ubuntu b/drivers/staging/wlags49_h2/README.ubuntu index 47beaec86e4a..edee8b9385be 100644 --- a/drivers/staging/wlags49_h2/README.ubuntu +++ b/drivers/staging/wlags49_h2/README.ubuntu | |||
@@ -116,7 +116,7 @@ LICENSE | |||
116 | 116 | ||
117 | The Agere Systems license applies. This is why I include the original | 117 | The Agere Systems license applies. This is why I include the original |
118 | README.wlags49. The instructions in that file are bogus now. I also | 118 | README.wlags49. The instructions in that file are bogus now. I also |
119 | include the man page. Eventhough setting parameters on the module | 119 | include the man page. Even though setting parameters on the module |
120 | does not work anymore but it provides some information about all the | 120 | does not work anymore but it provides some information about all the |
121 | settings. | 121 | settings. |
122 | 122 | ||
diff --git a/drivers/staging/wlags49_h2/TODO b/drivers/staging/wlags49_h2/TODO index 14aa415b1a82..94032b6ac2b5 100644 --- a/drivers/staging/wlags49_h2/TODO +++ b/drivers/staging/wlags49_h2/TODO | |||
@@ -1,7 +1,7 @@ | |||
1 | First of all, the best thing would be that this driver becomes obsolte by | 1 | First of all, the best thing would be that this driver becomes obsolte by |
2 | adding support for Hermes II and Hermes II.5 cards to the existing orinoco | 2 | adding support for Hermes II and Hermes II.5 cards to the existing orinoco |
3 | driver. The orinoco driver currently only supports Hermes I based cards. | 3 | driver. The orinoco driver currently only supports Hermes I based cards. |
4 | Since this will not happen by magic and has not happend until now this | 4 | Since this will not happen by magic and has not happened until now this |
5 | driver provides a stop-gap solution for these type of cards. | 5 | driver provides a stop-gap solution for these type of cards. |
6 | 6 | ||
7 | Having said that, the following wishlist comes to mind to make the driver | 7 | Having said that, the following wishlist comes to mind to make the driver |
@@ -18,7 +18,7 @@ TODO: | |||
18 | - the driver is split into a Hermes II and a Hermes II.5 part, it | 18 | - the driver is split into a Hermes II and a Hermes II.5 part, it |
19 | would be nice to handle both with one module instead of two | 19 | would be nice to handle both with one module instead of two |
20 | - review by the wireless developer community | 20 | - review by the wireless developer community |
21 | - verify the code against the coding standards for a propper linux | 21 | - verify the code against the coding standards for a proper linux |
22 | driver | 22 | driver |
23 | - resolve license issues (?) | 23 | - resolve license issues (?) |
24 | 24 | ||
diff --git a/drivers/staging/wlags49_h2/hcf.c b/drivers/staging/wlags49_h2/hcf.c index d4bdd3ee8be1..a73317ef9350 100644 --- a/drivers/staging/wlags49_h2/hcf.c +++ b/drivers/staging/wlags49_h2/hcf.c | |||
@@ -540,7 +540,7 @@ HCF_STATIC hcf_16* BASED xxxx[ ] = { | |||
540 | * | 540 | * |
541 | *.CONDITIONS | 541 | *.CONDITIONS |
542 | * Except for hcf_action with HCF_ACT_INT_FORCE_ON or HCF_ACT_INT_OFF as parameter or hcf_connect with an I/O | 542 | * Except for hcf_action with HCF_ACT_INT_FORCE_ON or HCF_ACT_INT_OFF as parameter or hcf_connect with an I/O |
543 | * address (i.e. not HCF_DISCONNECT), all hcf-function calls MUST be preceeded by a call of hcf_action with | 543 | * address (i.e. not HCF_DISCONNECT), all hcf-function calls MUST be preceded by a call of hcf_action with |
544 | * HCF_ACT_INT_OFF as parameter. | 544 | * HCF_ACT_INT_OFF as parameter. |
545 | * Note that hcf_connect defaults to NIC interrupt disabled mode, i.e. as if hcf_action( HCF_ACT_INT_OFF ) | 545 | * Note that hcf_connect defaults to NIC interrupt disabled mode, i.e. as if hcf_action( HCF_ACT_INT_OFF ) |
546 | * was called. | 546 | * was called. |
@@ -843,7 +843,7 @@ hcf_16 i; | |||
843 | *.MODULE int hcf_cntl( IFBP ifbp, hcf_16 cmd ) | 843 | *.MODULE int hcf_cntl( IFBP ifbp, hcf_16 cmd ) |
844 | *.PURPOSE Connect or disconnect a specific port to a specific network. | 844 | *.PURPOSE Connect or disconnect a specific port to a specific network. |
845 | *!! ;???????????????? continue needs more explanation | 845 | *!! ;???????????????? continue needs more explanation |
846 | * recovers by means of "continue" when the connect proces in CCX mode fails | 846 | * recovers by means of "continue" when the connect process in CCX mode fails |
847 | * Enables or disables data transmission and reception for the NIC. | 847 | * Enables or disables data transmission and reception for the NIC. |
848 | * Activates static NIC configuration for a specific port at connect. | 848 | * Activates static NIC configuration for a specific port at connect. |
849 | * Activates static configuration for all ports at enable. | 849 | * Activates static configuration for all ports at enable. |
@@ -1170,12 +1170,12 @@ LTV_STRCT x; | |||
1170 | io_addr = io_base; | 1170 | io_addr = io_base; |
1171 | } | 1171 | } |
1172 | 1172 | ||
1173 | #if 0 //;? if a subsequent hcf_connect is preceeded by an hcf_disconnect the wakeup is not needed !! | 1173 | #if 0 //;? if a subsequent hcf_connect is preceded by an hcf_disconnect the wakeup is not needed !! |
1174 | #if HCF_SLEEP | 1174 | #if HCF_SLEEP |
1175 | OUT_PORT_WORD( .....+HREG_IO, HREG_IO_WAKEUP_ASYNC ); //OPW not yet useable | 1175 | OUT_PORT_WORD( .....+HREG_IO, HREG_IO_WAKEUP_ASYNC ); //OPW not yet useable |
1176 | MSF_WAIT(800); // MSF-defined function to wait n microseconds. | 1176 | MSF_WAIT(800); // MSF-defined function to wait n microseconds. |
1177 | note that MSF_WAIT uses not yet defined!!!! IFB_IOBase and IFB_TickIni (via PROT_CNT_INI) | 1177 | note that MSF_WAIT uses not yet defined!!!! IFB_IOBase and IFB_TickIni (via PROT_CNT_INI) |
1178 | so be carefull if this code is restored | 1178 | so be careful if this code is restored |
1179 | #endif // HCF_SLEEP | 1179 | #endif // HCF_SLEEP |
1180 | #endif // 0 | 1180 | #endif // 0 |
1181 | 1181 | ||
@@ -1563,7 +1563,7 @@ DESC_STRCT *p = descp->next_desc_addr; //pointer to 2nd descriptor of frame | |||
1563 | * This function is called by the MSF to supply the HCF with new/more buffers for receive purposes. | 1563 | * This function is called by the MSF to supply the HCF with new/more buffers for receive purposes. |
1564 | * The HCF can be used in 2 fashions: with and without encapsulation for data transfer. | 1564 | * The HCF can be used in 2 fashions: with and without encapsulation for data transfer. |
1565 | * This is controlled at compile time by the HCF_ENC bit of the HCF_ENCAP system constant. | 1565 | * This is controlled at compile time by the HCF_ENC bit of the HCF_ENCAP system constant. |
1566 | * As a consequence, some additional constaints apply to the number of descriptor and the buffers associated | 1566 | * As a consequence, some additional constraints apply to the number of descriptor and the buffers associated |
1567 | * with the first 2 descriptors. Independent of the encapsulation feature, the COUNT fields are ignored. | 1567 | * with the first 2 descriptors. Independent of the encapsulation feature, the COUNT fields are ignored. |
1568 | * A special case is the supplying of the DELWA descriptor, which must be supplied as the first descriptor. | 1568 | * A special case is the supplying of the DELWA descriptor, which must be supplied as the first descriptor. |
1569 | * | 1569 | * |
@@ -1735,7 +1735,7 @@ DESC_STRCT *descp; // pointer to start of FrameList | |||
1735 | * - in case encapsulation by the HCF is selected: | 1735 | * - in case encapsulation by the HCF is selected: |
1736 | * - The FrameList does not consists of at least 2 Descriptors. | 1736 | * - The FrameList does not consists of at least 2 Descriptors. |
1737 | * - The first databuffer does not contain exactly the (space for) the 802.11 header (== 28 words) | 1737 | * - The first databuffer does not contain exactly the (space for) the 802.11 header (== 28 words) |
1738 | * - The first databuffer does not have a size to additionally accomodate the 802.3 header and the | 1738 | * - The first databuffer does not have a size to additionally accommodate the 802.3 header and the |
1739 | * SNAP header of the frame after encapsulation (== 39 words). | 1739 | * SNAP header of the frame after encapsulation (== 39 words). |
1740 | * - The second databuffer does not contain at least DA, SA and 'type/length' (==14 bytes or 7 words) | 1740 | * - The second databuffer does not contain at least DA, SA and 'type/length' (==14 bytes or 7 words) |
1741 | *!! The 2nd part of the list of asserts should be kept in sync with put_frame_lst, in order to get | 1741 | *!! The 2nd part of the list of asserts should be kept in sync with put_frame_lst, in order to get |
@@ -1762,14 +1762,14 @@ DESC_STRCT *descp; // pointer to start of FrameList | |||
1762 | * - Copy DA/SA fields from the 2nd buffer | 1762 | * - Copy DA/SA fields from the 2nd buffer |
1763 | * - Calculate total length of the message (snap-header + type-field + the length of all buffer fragments | 1763 | * - Calculate total length of the message (snap-header + type-field + the length of all buffer fragments |
1764 | * associated with the 802.3 frame (i.e all descriptors except the first), but not the DestinationAddress, | 1764 | * associated with the 802.3 frame (i.e all descriptors except the first), but not the DestinationAddress, |
1765 | * SourceAddress and lenght-field) | 1765 | * SourceAddress and length-field) |
1766 | * Assert the message length | 1766 | * Assert the message length |
1767 | * Write length. Note that the message is in BE format, hence on LE platforms the length must be converted | 1767 | * Write length. Note that the message is in BE format, hence on LE platforms the length must be converted |
1768 | * ;? THIS IS NOT WHAT CURRENTLY IS IMPLEMENTED | 1768 | * ;? THIS IS NOT WHAT CURRENTLY IS IMPLEMENTED |
1769 | * - Write snap header. Note that the last byte of the snap header is NOT copied, that byte is already in | 1769 | * - Write snap header. Note that the last byte of the snap header is NOT copied, that byte is already in |
1770 | * place as result of the call to hcf_encap. | 1770 | * place as result of the call to hcf_encap. |
1771 | * Note that there are many ways to skin a cat. To express the offsets in the 1st buffer while writing | 1771 | * Note that there are many ways to skin a cat. To express the offsets in the 1st buffer while writing |
1772 | * the snap header, HFS_TYPE is choosen as a reference point to make it easier to grasp that the snap header | 1772 | * the snap header, HFS_TYPE is chosen as a reference point to make it easier to grasp that the snap header |
1773 | * and encapsualtion type are at least relative in the right. | 1773 | * and encapsualtion type are at least relative in the right. |
1774 | *8: modify 1st descriptor to reflect moved part of the 802.3 header + Snap-header | 1774 | *8: modify 1st descriptor to reflect moved part of the 802.3 header + Snap-header |
1775 | * modify 2nd descriptor to skip the moved part of the 802.3 header (DA/SA | 1775 | * modify 2nd descriptor to skip the moved part of the 802.3 header (DA/SA |
@@ -1933,7 +1933,7 @@ hcf_16 t = (hcf_16)(*type<<8) + *(type+1); /* 2 */ | |||
1933 | * HCF_SUCCESS Success | 1933 | * HCF_SUCCESS Success |
1934 | *!! via cmd_exe ( type >= CFG_RID_FW_MIN ) | 1934 | *!! via cmd_exe ( type >= CFG_RID_FW_MIN ) |
1935 | * HCF_ERR_NO_NIC NIC removed during retrieval | 1935 | * HCF_ERR_NO_NIC NIC removed during retrieval |
1936 | * HCF_ERR_TIME_OUT Expected Hermes event did not occure in expected time | 1936 | * HCF_ERR_TIME_OUT Expected Hermes event did not occur in expected time |
1937 | *!! via cmd_exe and setup_bap (type >= CFG_RID_FW_MIN ) | 1937 | *!! via cmd_exe and setup_bap (type >= CFG_RID_FW_MIN ) |
1938 | * HCF_ERR_DEFUNCT_... HCF is in defunct mode (bits 0x7F reflect cause) | 1938 | * HCF_ERR_DEFUNCT_... HCF is in defunct mode (bits 0x7F reflect cause) |
1939 | * | 1939 | * |
@@ -2958,7 +2958,7 @@ or | |||
2958 | * hcf_service_nic is also skipped in those cases. | 2958 | * hcf_service_nic is also skipped in those cases. |
2959 | * To prevent that hcf_service_nic reports bogus information to the MSF with all - possibly difficult to | 2959 | * To prevent that hcf_service_nic reports bogus information to the MSF with all - possibly difficult to |
2960 | * debug - undesirable side effects, it is paramount to check the NIC presence. In former days the presence | 2960 | * debug - undesirable side effects, it is paramount to check the NIC presence. In former days the presence |
2961 | * test was based on the Hermes register HREG_SW_0. Since in HCF_ACT_INT_OFF is choosen for strategy based on | 2961 | * test was based on the Hermes register HREG_SW_0. Since in HCF_ACT_INT_OFF is chosen for strategy based on |
2962 | * HREG_EV_STAT, this is now also used in hcf_service_nic. The motivation to change strategy is partly | 2962 | * HREG_EV_STAT, this is now also used in hcf_service_nic. The motivation to change strategy is partly |
2963 | * due to inconsistent F/W implementations with respect to HREG_SW_0 manipulation around reset and download. | 2963 | * due to inconsistent F/W implementations with respect to HREG_SW_0 manipulation around reset and download. |
2964 | * Note that in polled environments Card Removal is not detected by INT_OFF which makes the check in | 2964 | * Note that in polled environments Card Removal is not detected by INT_OFF which makes the check in |
@@ -4048,7 +4048,7 @@ hcf_32 FAR *p4; //prevent side effects from macro | |||
4048 | HCFASSERT( word_len == 0 || word_len == 2 || word_len == 4, word_len ) | 4048 | HCFASSERT( word_len == 0 || word_len == 2 || word_len == 4, word_len ) |
4049 | HCFASSERT( word_len == 0 || ((hcf_32)bufp & 1 ) == 0, (hcf_32)bufp ) | 4049 | HCFASSERT( word_len == 0 || ((hcf_32)bufp & 1 ) == 0, (hcf_32)bufp ) |
4050 | HCFASSERT( word_len <= len, MERGE2( word_len, len ) ) | 4050 | HCFASSERT( word_len <= len, MERGE2( word_len, len ) ) |
4051 | //see put_frag for an alternative implementation, but be carefull about what are int's and what are | 4051 | //see put_frag for an alternative implementation, but be careful about what are int's and what are |
4052 | //hcf_16's | 4052 | //hcf_16's |
4053 | if ( word_len ) { //. if there is anything to convert | 4053 | if ( word_len ) { //. if there is anything to convert |
4054 | hcf_8 c; | 4054 | hcf_8 c; |
@@ -4712,7 +4712,7 @@ int rc = HCF_SUCCESS; | |||
4712 | * Note that len is unsigned, so even MSF I/F violation works out O.K. | 4712 | * Note that len is unsigned, so even MSF I/F violation works out O.K. |
4713 | * The '2' in the expression "len+2" is used because 1 word is needed for L itself and 1 word is needed | 4713 | * The '2' in the expression "len+2" is used because 1 word is needed for L itself and 1 word is needed |
4714 | * for the zero-sentinel | 4714 | * for the zero-sentinel |
4715 | *8: update MailBox Info length report to MSF with "oldest" MB Info Block size. Be carefull here, if you get | 4715 | *8: update MailBox Info length report to MSF with "oldest" MB Info Block size. Be careful here, if you get |
4716 | * here before the MailBox is registered, you can't read from the buffer addressed by IFB_MBp (it is the | 4716 | * here before the MailBox is registered, you can't read from the buffer addressed by IFB_MBp (it is the |
4717 | * Null buffer) so don't move this code till the end of this routine but keep it where there is garuanteed | 4717 | * Null buffer) so don't move this code till the end of this routine but keep it where there is garuanteed |
4718 | * a buffer. | 4718 | * a buffer. |
diff --git a/drivers/staging/wlags49_h2/hcfdef.h b/drivers/staging/wlags49_h2/hcfdef.h index 4e20171b7829..cb1966d8473f 100644 --- a/drivers/staging/wlags49_h2/hcfdef.h +++ b/drivers/staging/wlags49_h2/hcfdef.h | |||
@@ -315,7 +315,7 @@ err: these values should match; | |||
315 | 315 | ||
316 | #if HCF_DMA | 316 | #if HCF_DMA |
317 | //************************* DMA (bus mastering) | 317 | //************************* DMA (bus mastering) |
318 | // Be carefull to use these registers only at a genuine 32 bits NIC | 318 | // Be careful to use these registers only at a genuine 32 bits NIC |
319 | // On 16 bits NICs, these addresses are mapped into the range 0x00 through 0x3F with all consequences | 319 | // On 16 bits NICs, these addresses are mapped into the range 0x00 through 0x3F with all consequences |
320 | // thereof, e.g. HREG_DMA_CTRL register maps to HREG_CMD. | 320 | // thereof, e.g. HREG_DMA_CTRL register maps to HREG_CMD. |
321 | #define HREG_DMA_CTRL 0x0040 | 321 | #define HREG_DMA_CTRL 0x0040 |
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index 9e5da0815371..522a31090c58 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c | |||
@@ -2575,7 +2575,7 @@ static int wireless_set_scan(struct net_device *dev, struct iw_request_info *inf | |||
2575 | * This looks like a nice place to test if the HCF is still | 2575 | * This looks like a nice place to test if the HCF is still |
2576 | * communicating with the card. It seems that sometimes BAP_1 | 2576 | * communicating with the card. It seems that sometimes BAP_1 |
2577 | * gets corrupted. By looking at the comments in HCF the | 2577 | * gets corrupted. By looking at the comments in HCF the |
2578 | * cause is still a mistery. Okay, the communication to the | 2578 | * cause is still a mystery. Okay, the communication to the |
2579 | * card is dead, reset the card to revive. | 2579 | * card is dead, reset the card to revive. |
2580 | */ | 2580 | */ |
2581 | if((lp->hcfCtx.IFB_CardStat & CARD_STAT_DEFUNCT) != 0) | 2581 | if((lp->hcfCtx.IFB_CardStat & CARD_STAT_DEFUNCT) != 0) |
@@ -3924,7 +3924,7 @@ void wl_wext_event_mic_failed( struct net_device *dev ) | |||
3924 | memset( msg, 0, sizeof( msg )); | 3924 | memset( msg, 0, sizeof( msg )); |
3925 | 3925 | ||
3926 | 3926 | ||
3927 | /* Becuase MIC failures are not part of the Wireless Extensions yet, they | 3927 | /* Because MIC failures are not part of the Wireless Extensions yet, they |
3928 | must be passed as a string using an IWEVCUSTOM event. In order for the | 3928 | must be passed as a string using an IWEVCUSTOM event. In order for the |
3929 | event to be effective, the string format must be known by both the | 3929 | event to be effective, the string format must be known by both the |
3930 | driver and the supplicant. The following is the string format used by the | 3930 | driver and the supplicant. The following is the string format used by the |
@@ -3999,7 +3999,7 @@ void wl_wext_event_assoc_ie( struct net_device *dev ) | |||
3999 | memcpy( &data.rawData, &( lp->ltvRecord.u.u8[1] ), 88 ); | 3999 | memcpy( &data.rawData, &( lp->ltvRecord.u.u8[1] ), 88 ); |
4000 | wpa_ie = wl_parse_wpa_ie( &data, &length ); | 4000 | wpa_ie = wl_parse_wpa_ie( &data, &length ); |
4001 | 4001 | ||
4002 | /* Becuase this event (Association WPA-IE) is not part of the Wireless | 4002 | /* Because this event (Association WPA-IE) is not part of the Wireless |
4003 | Extensions yet, it must be passed as a string using an IWEVCUSTOM event. | 4003 | Extensions yet, it must be passed as a string using an IWEVCUSTOM event. |
4004 | In order for the event to be effective, the string format must be known | 4004 | In order for the event to be effective, the string format must be known |
4005 | by both the driver and the supplicant. The following is the string format | 4005 | by both the driver and the supplicant. The following is the string format |
diff --git a/drivers/staging/wlags49_h25/TODO b/drivers/staging/wlags49_h25/TODO index 14aa415b1a82..94032b6ac2b5 100644 --- a/drivers/staging/wlags49_h25/TODO +++ b/drivers/staging/wlags49_h25/TODO | |||
@@ -1,7 +1,7 @@ | |||
1 | First of all, the best thing would be that this driver becomes obsolte by | 1 | First of all, the best thing would be that this driver becomes obsolte by |
2 | adding support for Hermes II and Hermes II.5 cards to the existing orinoco | 2 | adding support for Hermes II and Hermes II.5 cards to the existing orinoco |
3 | driver. The orinoco driver currently only supports Hermes I based cards. | 3 | driver. The orinoco driver currently only supports Hermes I based cards. |
4 | Since this will not happen by magic and has not happend until now this | 4 | Since this will not happen by magic and has not happened until now this |
5 | driver provides a stop-gap solution for these type of cards. | 5 | driver provides a stop-gap solution for these type of cards. |
6 | 6 | ||
7 | Having said that, the following wishlist comes to mind to make the driver | 7 | Having said that, the following wishlist comes to mind to make the driver |
@@ -18,7 +18,7 @@ TODO: | |||
18 | - the driver is split into a Hermes II and a Hermes II.5 part, it | 18 | - the driver is split into a Hermes II and a Hermes II.5 part, it |
19 | would be nice to handle both with one module instead of two | 19 | would be nice to handle both with one module instead of two |
20 | - review by the wireless developer community | 20 | - review by the wireless developer community |
21 | - verify the code against the coding standards for a propper linux | 21 | - verify the code against the coding standards for a proper linux |
22 | driver | 22 | driver |
23 | - resolve license issues (?) | 23 | - resolve license issues (?) |
24 | 24 | ||
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index ed751f418db9..21f25a21c291 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c | |||
@@ -1976,7 +1976,7 @@ static wlandevice_t *create_wlan(void) | |||
1976 | 1976 | ||
1977 | wlandev->nsdcaps = P80211_NSDCAP_HWFRAGMENT | P80211_NSDCAP_AUTOJOIN; | 1977 | wlandev->nsdcaps = P80211_NSDCAP_HWFRAGMENT | P80211_NSDCAP_AUTOJOIN; |
1978 | 1978 | ||
1979 | /* Initialize the device private data stucture. */ | 1979 | /* Initialize the device private data structure. */ |
1980 | hw->dot11_desired_bss_type = 1; | 1980 | hw->dot11_desired_bss_type = 1; |
1981 | 1981 | ||
1982 | return wlandev; | 1982 | return wlandev; |
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 8762a5327693..9669c22cc82c 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c | |||
@@ -7834,7 +7834,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, | |||
7834 | == 600)) { | 7834 | == 600)) { |
7835 | index++; | 7835 | index++; |
7836 | } | 7836 | } |
7837 | /* Alan 10/19/2007; do the similiar adjustment like XGISearchCRT1Rate() */ | 7837 | /* Alan 10/19/2007; do the similar adjustment like XGISearchCRT1Rate() */ |
7838 | if ((pVBInfo->RefIndex[RefreshRateTableIndex].XRes == 1024) | 7838 | if ((pVBInfo->RefIndex[RefreshRateTableIndex].XRes == 1024) |
7839 | && (pVBInfo->RefIndex[RefreshRateTableIndex].YRes | 7839 | && (pVBInfo->RefIndex[RefreshRateTableIndex].YRes |
7840 | == 768)) { | 7840 | == 768)) { |
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h index 4b87951f4322..d613e84aab62 100644 --- a/drivers/staging/xgifb/vgatypes.h +++ b/drivers/staging/xgifb/vgatypes.h | |||
@@ -85,7 +85,7 @@ struct xgi_hw_device_info | |||
85 | unsigned long *); | 85 | unsigned long *); |
86 | }; | 86 | }; |
87 | 87 | ||
88 | /* Addtional IOCTL for communication xgifb <> X driver */ | 88 | /* Additional IOCTL for communication xgifb <> X driver */ |
89 | /* If changing this, xgifb.h must also be changed (for xgifb) */ | 89 | /* If changing this, xgifb.h must also be changed (for xgifb) */ |
90 | 90 | ||
91 | 91 | ||