scripts/spelling.txt: add "varible" pattern and fix typo instances

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.

Link: http://lkml.kernel.org/r/1481573103-11329-11-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Orabug: 26132523
(cherry picked from commit b564d62e67560423965c43d60249a09d8e70a27a)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Brian Maly <brian.maly@oracle.com>

diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas
index 18b5709900408d949afb31868832fbbf3ad814df..3519f6b34ede145081eb284b7055711017128c91 100644 (file)
--- 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 c2188bc0b580b615ae791842e2dab9a25c40269b..f8f59990d0291ceac96a8602fa80d99ebc609c44 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -847,9 +847,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 e74664b84925e9997072bc033c6938c8b0231a09..502c346aa790bf4f79218d816420f9997b69df3e 100644 (file)
--- 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 dd70993c266c38785510ab09f0315d1f1775d05b..6be89e8490cf94f101076775b0005a90522c529c 100644 (file)
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -262,7 +262,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 a0a431824f63a731728bd36279dc76b86cc2471b..3215b07f58b0ddb4dc113de51a25c46b782b47f7 100644 (file)
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -625,9 +625,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 bb8e4d0a19119dd1bd8b118c22a74eccc8337502..a8fb73441f01dd0a6075ce81356e1c9244909fb7 100644 (file)
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -1014,6 +1014,7 @@ vaid||valid
 vaild||valid
 valide||valid
 variantions||variations
+varible||variable
 varient||variant
 vaule||value
 verbse||verbose