aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2017-05-08 18:57:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-08 20:15:13 -0400
commit8ac1ed791401790968fd00ca63ca4fa814677199 (patch)
tree5a5e86c399c1411348d23809d958bf1e80bbb773
parent6e7c2b4dd36d8336f876c66a31d9b84616f3b2c4 (diff)
treewide: spelling: correct diffrent[iate] and banlance typos
Add these misspellings to scripts/spelling.txt too Link: http://lkml.kernel.org/r/962aace119675e5fe87be2a88ddac1a5486f8e60.1490931810.git.joe@perches.com Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c2
-rw-r--r--drivers/net/ethernet/qlogic/qed/qed_int.c2
-rw-r--r--drivers/net/ethernet/qlogic/qed/qed_main.c2
-rw-r--r--drivers/net/ethernet/qlogic/qed/qed_sriov.c2
-rw-r--r--include/linux/mlx4/device.h2
-rw-r--r--scripts/spelling.txt3
7 files changed, 9 insertions, 6 deletions
diff --git a/drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h b/drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h
index 354ec07eae87..23ae72468025 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h
+++ b/drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h
@@ -70,7 +70,7 @@
70* (3) both long and short but short preferred and long only when necesarry 70* (3) both long and short but short preferred and long only when necesarry
71* 71*
72* These modes must be selected compile time via compile switches. 72* These modes must be selected compile time via compile switches.
73* Compile switch settings for the diffrent modes: 73* Compile switch settings for the different modes:
74* (1) DRXDAPFASI_LONG_ADDR_ALLOWED=0, DRXDAPFASI_SHORT_ADDR_ALLOWED=1 74* (1) DRXDAPFASI_LONG_ADDR_ALLOWED=0, DRXDAPFASI_SHORT_ADDR_ALLOWED=1
75* (2) DRXDAPFASI_LONG_ADDR_ALLOWED=1, DRXDAPFASI_SHORT_ADDR_ALLOWED=0 75* (2) DRXDAPFASI_LONG_ADDR_ALLOWED=1, DRXDAPFASI_SHORT_ADDR_ALLOWED=0
76* (3) DRXDAPFASI_LONG_ADDR_ALLOWED=1, DRXDAPFASI_SHORT_ADDR_ALLOWED=1 76* (3) DRXDAPFASI_LONG_ADDR_ALLOWED=1, DRXDAPFASI_SHORT_ADDR_ALLOWED=1
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index cea6bdcde33f..8baf9d3eb4b1 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -1591,7 +1591,7 @@ static int __bnx2x_vlan_mac_execute_step(struct bnx2x *bp,
1591 if (rc != 0) { 1591 if (rc != 0) {
1592 __bnx2x_vlan_mac_h_pend(bp, o, *ramrod_flags); 1592 __bnx2x_vlan_mac_h_pend(bp, o, *ramrod_flags);
1593 1593
1594 /* Calling function should not diffrentiate between this case 1594 /* Calling function should not differentiate between this case
1595 * and the case in which there is already a pending ramrod 1595 * and the case in which there is already a pending ramrod
1596 */ 1596 */
1597 rc = 1; 1597 rc = 1;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.c b/drivers/net/ethernet/qlogic/qed/qed_int.c
index 0ed24d6e6c65..40f057edeafc 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_int.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_int.c
@@ -3058,7 +3058,7 @@ int qed_int_igu_read_cam(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
3058 3058
3059 /* There's a possibility the igu_sb_cnt_iov doesn't properly reflect 3059 /* There's a possibility the igu_sb_cnt_iov doesn't properly reflect
3060 * the number of VF SBs [especially for first VF on engine, as we can't 3060 * the number of VF SBs [especially for first VF on engine, as we can't
3061 * diffrentiate between empty entries and its entries]. 3061 * differentiate between empty entries and its entries].
3062 * Since we don't really support more SBs than VFs today, prevent any 3062 * Since we don't really support more SBs than VFs today, prevent any
3063 * such configuration by sanitizing the number of SBs to equal the 3063 * such configuration by sanitizing the number of SBs to equal the
3064 * number of VFs. 3064 * number of VFs.
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index b7ad36b91e12..c67ff1411799 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -978,7 +978,7 @@ static int qed_slowpath_start(struct qed_dev *cdev,
978 if (rc) 978 if (rc)
979 goto err2; 979 goto err2;
980 980
981 /* First Dword used to diffrentiate between various sources */ 981 /* First Dword used to differentiate between various sources */
982 data = cdev->firmware->data + sizeof(u32); 982 data = cdev->firmware->data + sizeof(u32);
983 983
984 qed_dbg_pf_init(cdev); 984 qed_dbg_pf_init(cdev);
diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
index d5df29f787c5..f5ed54d611ec 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_sriov.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
@@ -625,7 +625,7 @@ int qed_iov_hw_info(struct qed_hwfn *p_hwfn)
625 * - If !ARI, VFs would start on next device. 625 * - If !ARI, VFs would start on next device.
626 * so offset - (256 - pf_id) would provide the number. 626 * so offset - (256 - pf_id) would provide the number.
627 * Utilize the fact that (256 - pf_id) is achieved only by later 627 * Utilize the fact that (256 - pf_id) is achieved only by later
628 * to diffrentiate between the two. 628 * to differentiate between the two.
629 */ 629 */
630 630
631 if (p_hwfn->cdev->p_iov_info->offset < (256 - p_hwfn->abs_pf_id)) { 631 if (p_hwfn->cdev->p_iov_info->offset < (256 - p_hwfn->abs_pf_id)) {
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 74b765ce48ab..d5bed0875d30 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -108,7 +108,7 @@ enum {
108 MLX4_MFUNC_EQE_MASK = (MLX4_MFUNC_MAX_EQES - 1) 108 MLX4_MFUNC_EQE_MASK = (MLX4_MFUNC_MAX_EQES - 1)
109}; 109};
110 110
111/* Driver supports 3 diffrent device methods to manage traffic steering: 111/* Driver supports 3 different device methods to manage traffic steering:
112 * -device managed - High level API for ib and eth flow steering. FW is 112 * -device managed - High level API for ib and eth flow steering. FW is
113 * managing flow steering tables. 113 * managing flow steering tables.
114 * - B0 steering mode - Common low level API for ib and (if supported) eth. 114 * - B0 steering mode - Common low level API for ib and (if supported) eth.
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index aeca2c25de32..eb38f49d4b75 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -179,6 +179,7 @@ bakup||backup
179baloon||balloon 179baloon||balloon
180baloons||balloons 180baloons||balloons
181bandwith||bandwidth 181bandwith||bandwidth
182banlance||balance
182batery||battery 183batery||battery
183beacuse||because 184beacuse||because
184becasue||because 185becasue||because
@@ -375,6 +376,8 @@ dictionnary||dictionary
375didnt||didn't 376didnt||didn't
376diferent||different 377diferent||different
377differrence||difference 378differrence||difference
379diffrent||different
380diffrentiate||differentiate
378difinition||definition 381difinition||definition
379diplay||display 382diplay||display
380direectly||directly 383direectly||directly