Correct spelling typo in comments within staging/csr. Signed-off-by: Masanari Iida <standby24x7@xxxxxxxxx> --- drivers/staging/csr/csr_log.h | 6 +++--- drivers/staging/csr/csr_sdio.h | 24 ++++++++++++------------ drivers/staging/csr/csr_wifi_hip_unifi.h | 14 +++++++------- drivers/staging/csr/unifi_pdu_processing.c | 16 ++++++++-------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h index 304f065..c8c52eb 100644 --- a/drivers/staging/csr/csr_log.h +++ b/drivers/staging/csr/csr_log.h @@ -39,7 +39,7 @@ typedef u32 CsrLogLevelEnvironment; #define CSR_LOG_LEVEL_ENVIRONMENT_BGINT_START ((CsrLogLevelEnvironment) 0x00000100) /* Background Interrupt start events are logged */ #define CSR_LOG_LEVEL_ENVIRONMENT_BGINT_DONE ((CsrLogLevelEnvironment) 0x00000200) /* Background Interrupt done events are logged */ #define CSR_LOG_LEVEL_ENVIRONMENT_PROTO ((CsrLogLevelEnvironment) 0x00000400) /* Transport protocol events are logged */ -#define CSR_LOG_LEVEL_ENVIRONMENT_PROTO_LOC ((CsrLogLevelEnvironment) 0x00000800) /* The Location where the transport protocol event occured are logged NB: This is a supplement to CSR_LOG_LEVEL_ENVIRONMENT_PROTO, it has no effect without it */ +#define CSR_LOG_LEVEL_ENVIRONMENT_PROTO_LOC ((CsrLogLevelEnvironment) 0x00000800) /* The Location where the transport protocol event occurred are logged NB: This is a supplement to CSR_LOG_LEVEL_ENVIRONMENT_PROTO, it has no effect without it */ /* The bit masks between here are reserved for future usage */ #define CSR_LOG_LEVEL_ENVIRONMENT_ALL ((CsrLogLevelEnvironment) 0xFFFFFFFF) /* All possible environment data/events are logged WARNING: By using this define the application also accepts future possible environment data/events in the logs */ @@ -49,10 +49,10 @@ typedef u32 CsrLogLevelEnvironment; typedef u32 CsrLogLevelTask; #define CSR_LOG_LEVEL_TASK_OFF ((CsrLogLevelTask) 0x00000000) /* No events are logged for this task */ #define CSR_LOG_LEVEL_TASK_TEXT ((CsrLogLevelTask) 0x00000001) /* Text strings printed by a task are logged NB: This bit does not affect the CSR_LOG_TEXT_LEVEL interface. This has to be configured separately */ -#define CSR_LOG_LEVEL_TASK_TEXT_LOC ((CsrLogLevelTask) 0x00000002) /* The locaction where the text string call occured are logged. NB: This is a supplement to CSR_LOG_LEVEL_TASK_TEXT, it has no effect without it */ +#define CSR_LOG_LEVEL_TASK_TEXT_LOC ((CsrLogLevelTask) 0x00000002) /* The locaction where the text string call occurred are logged. NB: This is a supplement to CSR_LOG_LEVEL_TASK_TEXT, it has no effect without it */ #define CSR_LOG_LEVEL_TASK_STATE ((CsrLogLevelTask) 0x00000004) /* FSM state transitions in a task are logged */ #define CSR_LOG_LEVEL_TASK_STATE_NAME ((CsrLogLevelTask) 0x00000008) /* The name of each state in a FSM state transition are logged. NB: This is a supplement to CSR_LOG_LEVEL_TASK_STATE, it has no effect without it */ -#define CSR_LOG_LEVEL_TASK_STATE_LOC ((CsrLogLevelTask) 0x00000010) /* The location where the FSM state transition occured are logged. NB: This is a supplement to CSR_LOG_LEVEL_TASK_STATE, it has no effect without it */ +#define CSR_LOG_LEVEL_TASK_STATE_LOC ((CsrLogLevelTask) 0x00000010) /* The location where the FSM state transition occurred are logged. NB: This is a supplement to CSR_LOG_LEVEL_TASK_STATE, it has no effect without it */ #define CSR_LOG_LEVEL_TASK_TASK_SWITCH ((CsrLogLevelTask) 0x00000020) /* Activation and deactiation of a task are logged */ #define CSR_LOG_LEVEL_TASK_MESSAGE_PUT ((CsrLogLevelTask) 0x00000080) /* Message put operations are logged */ #define CSR_LOG_LEVEL_TASK_MESSAGE_PUT_LOC ((CsrLogLevelTask) 0x00000100) /* The location where a message was sent are logged. NB: This is a supplement to CSR_LOG_LEVEL_TASK_MESSAGE_PUT, it has no effect without it */ diff --git a/drivers/staging/csr/csr_sdio.h b/drivers/staging/csr/csr_sdio.h index f0cda84..69fb4c1 100644 --- a/drivers/staging/csr/csr_sdio.h +++ b/drivers/staging/csr/csr_sdio.h @@ -261,7 +261,7 @@ void CsrSdioFunctionDriverUnregister(CsrSdioFunctionDriver *functionDriver); * CSR_RESULT_SUCCESS - The specified function was enabled/disabled. * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore. - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. The state of the + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. The state of the * related bit in the I/O Enable register is * undefined. * CSR_SDIO_RESULT_TIMEOUT - No response from the device, or the related @@ -299,7 +299,7 @@ CsrResult CsrSdioFunctionDisable(CsrSdioFunction *function); * CSR_RESULT_SUCCESS - The specified function was enabled/disabled. * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore. - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. The state of the + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. The state of the * related bit in the INT Enable register is * unchanged. * CSR_SDIO_RESULT_INVALID_VALUE - The specified function cannot be @@ -412,7 +412,7 @@ void CsrSdioResumeAcknowledge(CsrSdioFunction *function, CsrResult result); * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid. * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore. - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. The configured block + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. The configured block * size is undefined. * CSR_SDIO_RESULT_TIMEOUT - No response from the device. * @@ -460,7 +460,7 @@ CsrResult CsrSdioBlockSizeSet(CsrSdioFunction *function, u16 blockSize); * maxFrequency - The maximum clock frequency for the function in Hertz. * * RETURNS - * CSR_RESULT_SUCCESS - The maximum clock frequency was succesfully + * CSR_RESULT_SUCCESS - The maximum clock frequency was successfully * set for the function. * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid. @@ -498,7 +498,7 @@ CsrResult CsrSdioMaxBusClockFrequencySet(CsrSdioFunction *function, u32 maxFrequ * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid. * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore. - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. No data read/written. + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. No data read/written. * CSR_SDIO_RESULT_TIMEOUT - No response from the device. * * NOTE: If the SDIO R5 response is available, and either of the @@ -541,7 +541,7 @@ void CsrSdioWrite8Async(CsrSdioFunction *function, u32 address, u8 data, CsrSdio * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid. * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore. - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. Data may have been + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. Data may have been * partially read/written. * CSR_SDIO_RESULT_TIMEOUT - No response from the device. * @@ -587,7 +587,7 @@ void CsrSdioWrite16Async(CsrSdioFunction *function, u32 address, u16 data, CsrSd * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid. * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore. - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. No data read/written. + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. No data read/written. * CSR_SDIO_RESULT_TIMEOUT - No response from the device. * * NOTE: If the SDIO R5 response is available, and either of the @@ -632,7 +632,7 @@ void CsrSdioF0Write8Async(CsrSdioFunction *function, u32 address, u8 data, CsrSd * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid. * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore. - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. Data may have been + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. Data may have been * partially read/written. * CSR_SDIO_RESULT_TIMEOUT - No response from the device. * @@ -670,11 +670,11 @@ void CsrSdioWriteAsync(CsrSdioFunction *function, u32 address, const void *data, * the device to power on/off. * * RETURNS (only CsrSdioPowerOn) - * CSR_RESULT_SUCCESS - Power was succesfully reapplied and the device + * CSR_RESULT_SUCCESS - Power was successfully reapplied and the device * has been reinitialised. * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore. - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured during reinitialisation. + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred during reinitialisation. * CSR_SDIO_RESULT_TIMEOUT - No response from the device during * reinitialisation. * CSR_SDIO_RESULT_NOT_RESET - The power was not removed by the @@ -697,11 +697,11 @@ void CsrSdioPowerOff(CsrSdioFunction *function); * the device to hard reset. * * RETURNS - * CSR_RESULT_SUCCESS - Reset was succesfully performed and the device + * CSR_RESULT_SUCCESS - Reset was successfully performed and the device * has been reinitialised. * CSR_RESULT_FAILURE - Unspecified/unknown error. * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore. - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured during reinitialisation. + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred during reinitialisation. * CSR_SDIO_RESULT_TIMEOUT - No response from the device during * reinitialisation. * CSR_SDIO_RESULT_NOT_RESET - The reset was not applied because it is not diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h index 9042efa..332e6ae 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi.h +++ b/drivers/staging/csr/csr_wifi_hip_unifi.h @@ -267,7 +267,7 @@ card_t* unifi_alloc_card(CsrSdioFunction *sdiopriv, void *ospriv); * * @return \b 0 if UniFi is initialized. * - * @return \b -CSR_EIO if an I/O error occured while initializing UniFi + * @return \b -CSR_EIO if an I/O error occurred while initializing UniFi * * @return \b -CSR_ENODEV if the card is no longer present. * @@ -315,7 +315,7 @@ void unifi_cancel_pending_signals(card_t *card); * * @return \b 0 signal is sent. * - * @return \b -CSR_EIO if an error occured while sending the signal + * @return \b -CSR_EIO if an error occurred while sending the signal * * @return \b -CSR_ENODEV if the card is no longer present. * @@ -365,7 +365,7 @@ void unifi_card_info(card_t *card, card_info_t *card_info); * * @return \b 0 if the check was performed. * - * @return \b -CSR_EIO if an error occured while checking the status. + * @return \b -CSR_EIO if an error occurred while checking the status. * * @return \b -CSR_ENODEV if the card is no longer present. * @@ -387,11 +387,11 @@ CsrResult unifi_check_io_status(card_t *card, s32 *status); * is required. If unifi_bh() is called before the timeout expires, * the caller must pass in the remaining time. * - * @return \b 0 if no error occured. + * @return \b 0 if no error occurred. * * @return \b -CSR_ENODEV if the card is no longer present. * - * @return \b -CSR_E* if an error occured while running the bottom half. + * @return \b -CSR_E* if an error occurred while running the bottom half. * * @ingroup upperedge */ @@ -443,7 +443,7 @@ enum unifi_periodic_wake_mode * * @param periodic_wake_mode the Periodic Wake Mode. * - * @return \b 0 if no error occured. + * @return \b 0 if no error occurred. * * @return \b -CSR_E* if the request failed. * @@ -462,7 +462,7 @@ CsrResult unifi_configure_low_power_mode(card_t *card, * * @param card the HIP core lib API context. * - * @return \b 0 if no error occured. + * @return \b 0 if no error occurred. * * @return \b -CSR_ENODEV if the card is no longer present. * diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index 8f21d98..71b0a3d 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c @@ -1469,7 +1469,7 @@ static int update_macheader(unifi_priv_t *priv, struct sk_buff *skb, } } - /* prepare the complete skb, by pushing the MAC header to the begining of the skb->data */ + /* prepare the complete skb, by pushing the MAC header to the beginning of the skb->data */ unifi_trace(priv, UDBG5, "updated Mac Header: %d \n",macHeaderLengthInBytes); memcpy(bufPtr, macHeaderBuf, macHeaderLengthInBytes); @@ -1547,7 +1547,7 @@ uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb, return -1; } - /* fetch the destination record from staion record database */ + /* fetch the destination record from station record database */ dstStaInfo = CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress(priv, ehdr->h_dest, interfaceTag); /* AP mode processing, & if packet is unicast */ @@ -1879,13 +1879,13 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, } else if ((pktType == CSR_WIFI_MULTICAST_PDU) && (!status)) { - /* If broadcast Tim is set && queuing is successfull, then only update TIM */ + /* If broadcast Tim is set && queuing is successful, then only update TIM */ spin_lock_irqsave(&priv->staRecord_lock,lock_flags); interfacePriv->noOfbroadcastPktQueued++; spin_unlock_irqrestore(&priv->staRecord_lock,lock_flags); } } - /* If broadcast Tim is set && queuing is successfull, then only update TIM */ + /* If broadcast Tim is set && queuing is successful, then only update TIM */ if(setBcTim && !status) { unifi_trace(priv, UDBG3, "tim set due to broadcast pkt\n"); if (!interfacePriv->bcTimSetReqPendingFlag) @@ -1996,7 +1996,7 @@ s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, u16 interfaceTag */ protection = interfacePriv->protect; } else { - /* fetch the destination record from staion record database */ + /* fetch the destination record from station record database */ dstStaInfo = CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress(priv, daddr, interfaceTag); if (!dstStaInfo) { unifi_trace(priv, UDBG3, "peer not found in station record in send_ma_pkt_request\n"); @@ -3185,7 +3185,7 @@ void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceT /*Send Data From Management Frames*/ /* Priority orders for delivering the buffered packets are * 1. Deliver the Management frames if there - * 2. Other access catagory frames which are non deliver enable including UNIFI_TRAFFIC_Q_VO + * 2. Other access category frames which are non deliver enable including UNIFI_TRAFFIC_Q_VO * priority is from VO->BK */ @@ -3457,7 +3457,7 @@ CsrWifiRouterCtrlStaInfo_t *CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress( interfacePriv = priv->interfacePriv[interfaceTag]; - /* disable the preemption untill station record is fetched */ + /* disable the preemption until station record is fetched */ spin_lock_irqsave(&priv->staRecord_lock,lock_flags); for (i = 0; i < UNIFI_MAX_CONNECTIONS; i++) { @@ -3686,7 +3686,7 @@ void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interface if (interfacePriv->noOfbroadcastPktQueued) { /* Update the EOSP to the HEAD of b/c list - * beacuse we have received any mgmt packet so it should not hold for long time + * because we have received any mgmt packet so it should not hold for long time * peer may time out. */ spin_lock_irqsave(&priv->tx_q_lock,lock_flags); -- 1.8.0.273.g2d242fb _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel