aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-02-27 17:29:53 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-27 21:43:47 -0500
commit608595ed9b33ff8dd77ba12b96023212846e39ff (patch)
treef2fb8725dfe5a399f824f423239e1d08f4d1cd5c
parentb8a14f3379a637f61deed4ce3e5180f1f34d40d1 (diff)
scripts/spelling.txt: add "therfore" pattern and fix typo instances
Fix typos and add the following to the scripts/spelling.txt: therfore||therefore Besides, tidy up comment blocks for 80-col wrapping. Link: http://lkml.kernel.org/r/1481573103-11329-31-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>
-rw-r--r--drivers/infiniband/sw/rdmavt/mad.c6
-rw-r--r--drivers/scsi/aacraid/linit.c2
-rw-r--r--drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c4
-rw-r--r--scripts/spelling.txt1
4 files changed, 7 insertions, 6 deletions
diff --git a/drivers/infiniband/sw/rdmavt/mad.c b/drivers/infiniband/sw/rdmavt/mad.c
index f6e99778d7ca..bba241faca61 100644
--- a/drivers/infiniband/sw/rdmavt/mad.c
+++ b/drivers/infiniband/sw/rdmavt/mad.c
@@ -74,9 +74,9 @@ int rvt_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
74 u16 *out_mad_pkey_index) 74 u16 *out_mad_pkey_index)
75{ 75{
76 /* 76 /*
77 * MAD processing is quite different between hfi1 and qib. Therfore this 77 * MAD processing is quite different between hfi1 and qib. Therefore
78 * is expected to be provided by the driver. Other drivers in the future 78 * this is expected to be provided by the driver. Other drivers in the
79 * may chose to implement this but it should not be made into a 79 * future may choose to implement this but it should not be made into a
80 * requirement. 80 * requirement.
81 */ 81 */
82 if (ibport_num_to_idx(ibdev, port_num) < 0) 82 if (ibport_num_to_idx(ibdev, port_num) < 0)
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 137d22d3a005..838347c44f32 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1630,7 +1630,7 @@ static int aac_acquire_resources(struct aac_dev *dev)
1630 1630
1631 if (!dev->sync_mode) { 1631 if (!dev->sync_mode) {
1632 /* After EEH recovery or suspend resume, max_msix count 1632 /* After EEH recovery or suspend resume, max_msix count
1633 * may change, therfore updating in init as well. 1633 * may change, therefore updating in init as well.
1634 */ 1634 */
1635 dev->init->r7.no_of_msix_vectors = cpu_to_le32(dev->max_msix); 1635 dev->init->r7.no_of_msix_vectors = cpu_to_le32(dev->max_msix);
1636 aac_adapter_start(dev); 1636 aac_adapter_start(dev);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 1dc8627e65b0..cb0b7ca36b1e 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -1875,8 +1875,8 @@ vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)
1875** 1875**
1876** VC_RESUME_IDLE - Initialise the resume completion at the same time. The 1876** VC_RESUME_IDLE - Initialise the resume completion at the same time. The
1877** resume completion is in it's 'done' state whenever 1877** resume completion is in it's 'done' state whenever
1878** videcore is running. Therfore, the VC_RESUME_IDLE state 1878** videcore is running. Therefore, the VC_RESUME_IDLE
1879** implies that videocore is suspended. 1879** state implies that videocore is suspended.
1880** Hence, any thread which needs to wait until videocore is 1880** Hence, any thread which needs to wait until videocore is
1881** running can wait on this completion - it will only block 1881** running can wait on this completion - it will only block
1882** if videocore is suspended. 1882** if videocore is suspended.
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index 3aa95a19497b..56a9860080dc 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -1041,6 +1041,7 @@ targetting||targeting
1041teh||the 1041teh||the
1042temorary||temporary 1042temorary||temporary
1043temproarily||temporarily 1043temproarily||temporarily
1044therfore||therefore
1044thier||their 1045thier||their
1045threds||threads 1046threds||threads
1046threshhold||threshold 1047threshhold||threshold