Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4445d254cdc59d535616d61f3b7b7cd573e95cf4

Authored by Masanari Iida
Committed by Greg Kroah-Hartman
1 parent bc73488cb7
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

staging:csr: Fix typo in staging/csr driver 

Correct spelling typo in comment within staging/csr

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 3 changed files with 16 additions and 16 deletions Side-by-side Diff

drivers/staging/csr/bh.c
Diff comments   View file @ 4445d25
... ... @@ -373,7 +373,7 @@
373 373 unifi_priv_t *priv = ospriv;
374 374  
375 375 /*
376   - * If an error has occured, we discard silently all messages from the bh
  376 + * If an error has occurred, we discard silently all messages from the bh
377 377 * until the error has been processed and the unifi has been reinitialised.
378 378 */
379 379 if (priv->bh_thread.block_thread == 1) {
drivers/staging/csr/csr_log.h
Diff comments   View file @ 4445d25
... ... @@ -34,7 +34,7 @@
34 34 #define CSR_LOG_LEVEL_ENVIRONMENT_BGINT_START ((CsrLogLevelEnvironment) 0x00000100) /* Background Interrupt start events are logged */
35 35 #define CSR_LOG_LEVEL_ENVIRONMENT_BGINT_DONE ((CsrLogLevelEnvironment) 0x00000200) /* Background Interrupt done events are logged */
36 36 #define CSR_LOG_LEVEL_ENVIRONMENT_PROTO ((CsrLogLevelEnvironment) 0x00000400) /* Transport protocol events are logged */
37   -#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 */
  37 +#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 */
38 38 /* The bit masks between here are reserved for future usage */
39 39 #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 */
40 40  
41 41  
... ... @@ -44,10 +44,10 @@
44 44 typedef u32 CsrLogLevelTask;
45 45 #define CSR_LOG_LEVEL_TASK_OFF ((CsrLogLevelTask) 0x00000000) /* No events are logged for this task */
46 46 #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 */
47   -#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 */
  47 +#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 */
48 48 #define CSR_LOG_LEVEL_TASK_STATE ((CsrLogLevelTask) 0x00000004) /* FSM state transitions in a task are logged */
49 49 #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 */
50   -#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 */
  50 +#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 */
51 51 #define CSR_LOG_LEVEL_TASK_TASK_SWITCH ((CsrLogLevelTask) 0x00000020) /* Activation and deactiation of a task are logged */
52 52 #define CSR_LOG_LEVEL_TASK_MESSAGE_PUT ((CsrLogLevelTask) 0x00000080) /* Message put operations are logged */
53 53 #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 */
drivers/staging/csr/csr_sdio.h
Diff comments   View file @ 4445d25
... ... @@ -257,7 +257,7 @@
257 257 * CSR_RESULT_SUCCESS - The specified function was enabled/disabled.
258 258 * CSR_RESULT_FAILURE - Unspecified/unknown error.
259 259 * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore.
260   - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. The state of the
  260 + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. The state of the
261 261 * related bit in the I/O Enable register is
262 262 * undefined.
263 263 * CSR_SDIO_RESULT_TIMEOUT - No response from the device, or the related
... ... @@ -295,7 +295,7 @@
295 295 * CSR_RESULT_SUCCESS - The specified function was enabled/disabled.
296 296 * CSR_RESULT_FAILURE - Unspecified/unknown error.
297 297 * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore.
298   - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. The state of the
  298 + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. The state of the
299 299 * related bit in the INT Enable register is
300 300 * unchanged.
301 301 * CSR_SDIO_RESULT_INVALID_VALUE - The specified function cannot be
... ... @@ -408,7 +408,7 @@
408 408 * CSR_RESULT_FAILURE - Unspecified/unknown error.
409 409 * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid.
410 410 * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore.
411   - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. The configured block
  411 + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. The configured block
412 412 * size is undefined.
413 413 * CSR_SDIO_RESULT_TIMEOUT - No response from the device.
414 414 *
... ... @@ -456,7 +456,7 @@
456 456 * maxFrequency - The maximum clock frequency for the function in Hertz.
457 457 *
458 458 * RETURNS
459   - * CSR_RESULT_SUCCESS - The maximum clock frequency was succesfully
  459 + * CSR_RESULT_SUCCESS - The maximum clock frequency was successfully
460 460 * set for the function.
461 461 * CSR_RESULT_FAILURE - Unspecified/unknown error.
462 462 * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid.
... ... @@ -494,7 +494,7 @@
494 494 * CSR_RESULT_FAILURE - Unspecified/unknown error.
495 495 * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid.
496 496 * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore.
497   - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. No data read/written.
  497 + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. No data read/written.
498 498 * CSR_SDIO_RESULT_TIMEOUT - No response from the device.
499 499 *
500 500 * NOTE: If the SDIO R5 response is available, and either of the
... ... @@ -537,7 +537,7 @@
537 537 * CSR_RESULT_FAILURE - Unspecified/unknown error.
538 538 * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid.
539 539 * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore.
540   - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. Data may have been
  540 + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. Data may have been
541 541 * partially read/written.
542 542 * CSR_SDIO_RESULT_TIMEOUT - No response from the device.
543 543 *
... ... @@ -583,7 +583,7 @@
583 583 * CSR_RESULT_FAILURE - Unspecified/unknown error.
584 584 * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid.
585 585 * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore.
586   - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. No data read/written.
  586 + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. No data read/written.
587 587 * CSR_SDIO_RESULT_TIMEOUT - No response from the device.
588 588 *
589 589 * NOTE: If the SDIO R5 response is available, and either of the
... ... @@ -628,7 +628,7 @@
628 628 * CSR_RESULT_FAILURE - Unspecified/unknown error.
629 629 * CSR_SDIO_RESULT_INVALID_VALUE - One or more arguments were invalid.
630 630 * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore.
631   - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured. Data may have been
  631 + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred. Data may have been
632 632 * partially read/written.
633 633 * CSR_SDIO_RESULT_TIMEOUT - No response from the device.
634 634 *
635 635  
... ... @@ -666,11 +666,11 @@
666 666 * the device to power on/off.
667 667 *
668 668 * RETURNS (only CsrSdioPowerOn)
669   - * CSR_RESULT_SUCCESS - Power was succesfully reapplied and the device
  669 + * CSR_RESULT_SUCCESS - Power was successfully reapplied and the device
670 670 * has been reinitialised.
671 671 * CSR_RESULT_FAILURE - Unspecified/unknown error.
672 672 * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore.
673   - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured during reinitialisation.
  673 + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred during reinitialisation.
674 674 * CSR_SDIO_RESULT_TIMEOUT - No response from the device during
675 675 * reinitialisation.
676 676 * CSR_SDIO_RESULT_NOT_RESET - The power was not removed by the
677 677  
... ... @@ -693,11 +693,11 @@
693 693 * the device to hard reset.
694 694 *
695 695 * RETURNS
696   - * CSR_RESULT_SUCCESS - Reset was succesfully performed and the device
  696 + * CSR_RESULT_SUCCESS - Reset was successfully performed and the device
697 697 * has been reinitialised.
698 698 * CSR_RESULT_FAILURE - Unspecified/unknown error.
699 699 * CSR_SDIO_RESULT_NO_DEVICE - The device does not exist anymore.
700   - * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occured during reinitialisation.
  700 + * CSR_SDIO_RESULT_CRC_ERROR - A CRC error occurred during reinitialisation.
701 701 * CSR_SDIO_RESULT_TIMEOUT - No response from the device during
702 702 * reinitialisation.
703 703 * CSR_SDIO_RESULT_NOT_RESET - The reset was not applied because it is not