iwlwifi: fix spelling errors

Fix spelling error across the driver.
Modified only comments and prints.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index bbed8fc..07e999a 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -228,7 +228,7 @@ struct iwl_pwr_tx_backoff {
 
 /**
  * struct iwl_cfg
- * @name: Offical name of the device
+ * @name: Official name of the device
  * @fw_name_pre: Firmware filename prefix. The api version and extension
  *     (.ucode) will be added to filename before loading from disk. The
  *     filename is constructed as fw_name_pre<api>.ucode.

diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index b8e5690..7783ac8 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -145,7 +145,7 @@ static struct iwlwifi_opmode_table {
 #define IWL_DEFAULT_SCAN_CHANNELS 40
 
 /*
- * struct fw_sec: Just for the image parsing proccess.
+ * struct fw_sec: Just for the image parsing process.
  * For the fw storage we are using struct fw_desc.
  */
 struct fw_sec {

diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.h b/drivers/net/wireless/iwlwifi/iwl-drv.h
index 67a3a24..cda746b 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-drv.h
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.h
@@ -123,7 +123,7 @@ struct iwl_cfg;
  * starts the driver: fetches the firmware. This should be called by bus
  * specific system flows implementations. For example, the bus specific probe
  * function should do bus related operations only, and then call to this
- * function. It returns the driver object or %NULL if an error occured.
+ * function. It returns the driver object or %NULL if an error occurred.
  */
 struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,
                              const struct iwl_cfg *cfg);

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
index 25d0105..219ca8a 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
@@ -248,7 +248,7 @@ static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
        otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
        if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
                /* stop in this case */
-               /* set the uncorrectable OTP ECC bit for acknowledgement */
+               /* set the uncorrectable OTP ECC bit for acknowledgment */
                iwl_set_bit(trans, CSR_OTP_GP_REG,
                            CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
                IWL_ERR(trans, "Uncorrectable OTP ECC error, abort OTP read\n");
@@ -256,7 +256,7 @@ static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
        }
        if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
                /* continue in this case */
-               /* set the correctable OTP ECC bit for acknowledgement */
+               /* set the correctable OTP ECC bit for acknowledgment */
                iwl_set_bit(trans, CSR_OTP_GP_REG,
                            CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
                IWL_ERR(trans, "Correctable OTP ECC error, continue read\n");

diff --cc drivers/net/wireless/iwlwifi/iwl-fh.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-fw-file.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-op-mode.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-phy-db.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-trans.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/sta.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/sta.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/time-event.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/time-event.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/utils.c
Simple merge