Fix typos and add the following to the scripts/spelling.txt:

  varible||variable

While we are here, tidy up the comment blocks that fit in a single
line for drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c and
net/sctp/transport.c.

Signed-off-by: Masahiro Yamada <[email protected]>
---

 Documentation/scsi/ChangeLog.megaraid_sas          | 2 +-
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +---
 drivers/net/wimax/i2400m/usb-fw.c                  | 2 +-
 kernel/torture.c                                   | 2 +-
 net/sctp/transport.c                               | 4 +---
 scripts/spelling.txt                               | 1 +
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Documentation/scsi/ChangeLog.megaraid_sas 
b/Documentation/scsi/ChangeLog.megaraid_sas
index 00ffdf18..234ddab 100644
--- a/Documentation/scsi/ChangeLog.megaraid_sas
+++ b/Documentation/scsi/ChangeLog.megaraid_sas
@@ -549,7 +549,7 @@ ii. Reduced by 1 max cmds sent to FW from Driver to make 
the reply_q_sz same
 3 Older Version   : 00.00.03.02
 
 i.     Send stop adapter to FW & Dump pending FW cmds before declaring adapter 
dead.
-       New varible added to set dbg level.
+       New variable added to set dbg level.
 ii.    Disable interrupt made as fn pointer as they are different for 1068 / 
1078
 iii.   Frame count optimization. Main frame can contain 2 SGE for 64 bit SGLs 
and
        3 SGE for 32 bit SGL
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c 
b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index a6198b7..0fb899ef 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -849,9 +849,7 @@ static void i40e_free_vf_res(struct i40e_vf *vf)
                wr32(hw, reg_idx, reg);
                i40e_flush(hw);
        }
-       /* reset some of the state varibles keeping
-        * track of the resources
-        */
+       /* reset some of the state variables keeping track of the resources */
        vf->num_queue_pairs = 0;
        vf->vf_states = 0;
        clear_bit(I40E_VF_STAT_INIT, &vf->vf_states);
diff --git a/drivers/net/wimax/i2400m/usb-fw.c 
b/drivers/net/wimax/i2400m/usb-fw.c
index e74664b..502c346 100644
--- a/drivers/net/wimax/i2400m/usb-fw.c
+++ b/drivers/net/wimax/i2400m/usb-fw.c
@@ -237,7 +237,7 @@ void __i2400mu_bm_notif_cb(struct urb *urb)
  *
  * @i2400m: device descriptor
  * @urb: urb to use
- * @completion: completion varible to complete when done
+ * @completion: completion variable to complete when done
  *
  * Data is always read to i2400m->bm_ack_buf
  */
diff --git a/kernel/torture.c b/kernel/torture.c
index 0d887eb..01a9997 100644
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -311,7 +311,7 @@ EXPORT_SYMBOL_GPL(torture_random);
 /*
  * Variables for shuffling.  The idea is to ensure that each CPU stays
  * idle for an extended period to test interactions with dyntick idle,
- * as well as interactions with any per-CPU varibles.
+ * as well as interactions with any per-CPU variables.
  */
 struct shuffle_task {
        struct list_head st_l;
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index ce54dce..f7b6c1a 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -630,9 +630,7 @@ void sctp_transport_reset(struct sctp_transport *t)
        t->srtt = 0;
        t->rttvar = 0;
 
-       /* Reset these additional varibles so that we have a clean
-        * slate.
-        */
+       /* Reset these additional variables so that we have a clean slate. */
        t->partial_bytes_acked = 0;
        t->flight_size = 0;
        t->error_count = 0;
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index 6230094..cf480fb 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -1056,6 +1056,7 @@ vaid||valid
 vaild||valid
 valide||valid
 variantions||variations
+varible||variable
 varient||variant
 vaule||value
 verbse||verbose
-- 
2.7.4

Reply via email to