Skip to contentSkip to conversation

Fix a few typos around the word "destroy"

PATCH Applied SF Markus Elfring 4 participants 10 messages Nov 24, 2014 – Nov 25, 2014

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

cover Fix a few typos around the word "destroy"

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 17:34:23 +0100
Subject: [PATCH 0/6] Fix a few typos around the word "destroy"

The word "destroy" was mistyped in some files.

Markus Elfring (6):
isci: Fix a typo for the word "destroy"
SCSI-libfc: Fix typos for the word "destroy"
video: fbdev-MMP: Fix typos for the word "destroy"
f2fs: Fix typos for the word "destroy" in jump labels
video: fbdev-MMP: Fix a typo for the word "destroyed"
Documentation-SCSI: Fix a typo for the word "destroy"

 Documentation/scsi/ChangeLog.lpfc | 2 +-
 drivers/scsi/isci/remote_device.c | 2 +-
 drivers/scsi/libfc/fc_fcp.c       | 4 ++--
 drivers/video/fbdev/mmp/core.c    | 6 +++---
 fs/f2fs/node.c                    | 8 ++++----
 5 files changed, 11 insertions(+), 11 deletions(-)
Signature · 1 line
2.1.3
#1 lore raw

PATCH 1/6 isci: Fix a typo for the word "destroy"

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 15:35:48 +0100

A word was corrected in the description for
the sci_remote_device_destruct() function.

---
 drivers/scsi/isci/remote_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/isci/remote_device.c +1 -1
index cc51f38..f54bb98 100644
@@ -1008,7 +1008,7 @@ static void sci_remote_device_initial_state_enter(struct sci_base_state_machine
  * successfully destructed or if some failure occurred. enum sci_status This value
  * is returned if the device is successfully destructed.
  * SCI_FAILURE_INVALID_REMOTE_DEVICE This value is returned if the supplied
- * device isn't valid (e.g. it's already been destoryed, the handle isn't
+ * device isn't valid (e.g. it's already been destroyed, the handle isn't
  * valid, etc.).
  */
 static enum sci_status sci_remote_device_destruct(struct isci_remote_device *idev)
Signature · 1 line
2.1.3
#2 lore raw

PATCH 2/6 SCSI-libfc: Fix typos for the word "destroy"

In reply to SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 15:40:41 +0100

Identifiers were corrected in descriptions for the functions fc_fcp_pkt_destroy() and fc_fcp_destroy().

---
 drivers/scsi/libfc/fc_fcp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/libfc/fc_fcp.c +2 -2
index 1d7e76e..5649fc9 100644
@@ -191,7 +191,7 @@ static void fc_fcp_pkt_hold(struct fc_fcp_pkt *fsp)
 }
 
 /**
- * fc_fcp_pkt_destory() - Release hold on a fcp_pkt
+ * fc_fcp_pkt_destroy() - Release hold on a fcp_pkt
  * @seq: The sequence that the FCP packet is on (required by destructor API)
  * @fsp: The FCP packet to be released
  *
@@ -2216,7 +2216,7 @@ int fc_change_queue_type(struct scsi_device *sdev, int tag_type)
 EXPORT_SYMBOL(fc_change_queue_type);
 
 /**
- * fc_fcp_destory() - Tear down the FCP layer for a given local port
+ * fc_fcp_destroy() - Tear down the FCP layer for a given local port
  * @lport: The local port that no longer needs the FCP layer
  */
 void fc_fcp_destroy(struct fc_lport *lport)
Signature · 1 line
2.1.3
#3 lore raw

PATCH 3/6 video: fbdev-MMP: Fix typos for the word "destroy"

In reply to SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 15:50:15 +0100

Two mistyped words were corrected in the description for the mmp_unregister_path() function.

---
 drivers/video/fbdev/mmp/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/mmp/core.c +2 -2
index b563b92..43ed576 100644
@@ -223,10 +223,10 @@ struct mmp_path *mmp_register_path(struct mmp_path_info *info)
 EXPORT_SYMBOL_GPL(mmp_register_path);
 
 /*
- * mmp_unregister_path - unregister and destory path
+ * mmp_unregister_path - unregister and destroy path
  * @p: path to be destoried.
  *
- * this function registers path and destorys it.
+ * this function registers path and destroys it.
  */
 void mmp_unregister_path(struct mmp_path *path)
 {
Signature · 1 line
2.1.3
#4 lore raw

Re: [PATCH 3/6] video: fbdev-MMP: Fix typos for the word "destroy"

Quoted 19 lines · SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 15:50:15 +0100

Two mistyped words were corrected in the description for the mmp_unregister_path() function.

---
 drivers/video/fbdev/mmp/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/mmp/core.c +0 -0
index b563b92..43ed576 100644
@@ -223,10 +223,10 @@ struct mmp_path *mmp_register_path(struct mmp_path_info *info)
 EXPORT_SYMBOL_GPL(mmp_register_path);
 

drivers/video/fbdev/mmp/core.c struct mmp_path *mmp_register_path(struct mmp_path_info *info) · line 232

Quoted 10 lines
drivers/video/fbdev/mmp/core.c +2 -2
 /*
- * mmp_unregister_path - unregister and destory path
+ * mmp_unregister_path - unregister and destroy path
  * @p: path to be destoried.
  *
- * this function registers path and destorys it.
+ * this function registers path and destroys it.
  */
 void mmp_unregister_path(struct mmp_path *path)
 {

Thanks, applied this and the patch 5/6 to fbdev tree.

Tomi

#5 lore raw

PATCH 4/6 f2fs: Fix typos for the word "destroy" in jump labels

In reply to SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 15:52:00 +0100

Two jump labels were adjusted in the implementation of the create_node_manager_caches() function because these identifiers contained typos.

---
 fs/f2fs/node.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
fs/f2fs/node.c +4 -4
index 4537819..74f44fe 100644
@@ -2057,17 +2057,17 @@ int __init create_node_manager_caches(void)
 	free_nid_slab = f2fs_kmem_cache_create("free_nid",
 			sizeof(struct free_nid));
 	if (!free_nid_slab)
-		goto destory_nat_entry;
+		goto destroy_nat_entry;
 
 	nat_entry_set_slab = f2fs_kmem_cache_create("nat_entry_set",
 			sizeof(struct nat_entry_set));
 	if (!nat_entry_set_slab)
-		goto destory_free_nid;
+		goto destroy_free_nid;
 	return 0;
 
-destory_free_nid:
+destroy_free_nid:
 	kmem_cache_destroy(free_nid_slab);
-destory_nat_entry:
+destroy_nat_entry:
 	kmem_cache_destroy(nat_entry_slab);
 fail:
 	return -ENOMEM;
Signature · 1 line
2.1.3
maintainer
#6 lore raw

Re: [PATCH 4/6] f2fs: Fix typos for the word "destroy" in jump labels

Hi Markus,

Merged.
Thank you for the patch.

Quoted 46 lines · SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 15:52:00 +0100

Two jump labels were adjusted in the implementation of the create_node_manager_caches() function because these identifiers contained typos.

---
 fs/f2fs/node.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
fs/f2fs/node.c +4 -4
index 4537819..74f44fe 100644
@@ -2057,17 +2057,17 @@ int __init create_node_manager_caches(void)
 	free_nid_slab = f2fs_kmem_cache_create("free_nid",
 			sizeof(struct free_nid));
 	if (!free_nid_slab)
-		goto destory_nat_entry;
+		goto destroy_nat_entry;
 
 	nat_entry_set_slab = f2fs_kmem_cache_create("nat_entry_set",
 			sizeof(struct nat_entry_set));
 	if (!nat_entry_set_slab)
-		goto destory_free_nid;
+		goto destroy_free_nid;
 	return 0;
 
-destory_free_nid:
+destroy_free_nid:
 	kmem_cache_destroy(free_nid_slab);
-destory_nat_entry:
+destroy_nat_entry:
 	kmem_cache_destroy(nat_entry_slab);
 fail:
 	return -ENOMEM;
Signature · 7 lines
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
#7 lore raw

PATCH 5/6 video: fbdev-MMP: Fix a typo for the word "destroyed"

In reply to SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 15:55:23 +0100

A word was corrected in the description for a parameter of the mmp_unregister_path() function.

---
 drivers/video/fbdev/mmp/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/mmp/core.c +1 -1
index 43ed576..a0f4960 100644
@@ -224,7 +224,7 @@ EXPORT_SYMBOL_GPL(mmp_register_path);
 
 /*
  * mmp_unregister_path - unregister and destroy path
- * @p: path to be destoried.
+ * @p: path to be destroyed.
  *
  * this function registers path and destroys it.
  */
Signature · 1 line
2.1.3
#8 lore raw

PATCH 6/6 Documentation-SCSI: Fix a typo for the word "destroy"

In reply to SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 17:25:30 +0100

An identifier was corrected in a change log entry because it contained a typo.

---
 Documentation/scsi/ChangeLog.lpfc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/scsi/ChangeLog.lpfc +1 -1
index 2f6d595..24d6508 100644
@@ -1263,7 +1263,7 @@ Changes from 20040515 to 20040526
 	* Switch from using internal bus/id/lun to similar data from
 	  scsi_device structure.
 	* Eliminate one-line function lpfc_find_target()
-	* Added slave_alloc, slave_destory
+	* Added slave_alloc, slave_destroy
 	* lpfc_scsi_cmd_start can now acquire lun pointer from
 	  scsi_device->hostdata, which is setup in slave_alloc.
 	* Eliminate unnecessary checking on every cmd just to see if we
Signature · 1 line
2.1.3
reviewer Acked-by on the v1 series
#9 lore raw
In reply to SF Markus Elfring
Quoted 5 lines · SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 24 Nov 2014 17:34:23 +0100
Subject: [PATCH 0/6] Fix a few typos around the word "destroy"

The word "destroy" was mistyped in some files.

For all 6 patches;

However, in th3 future, please document each patch as described in Documentation/SubmittingPatches:

Describe your changes in imperative mood, e.g. "make xyzzy do frotz" instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy to do frotz", as if you are giving orders to the codebase to change its behaviour.

E.g., instead of:

A word was corrected in the description for a parameter of the mmp_unregister_path() function.

Use:

Correct the description of a parameter of the mmp_unregister_path() function.

Thanks.

Quoted 16 lines

Markus Elfring (6):
isci: Fix a typo for the word "destroy"
SCSI-libfc: Fix typos for the word "destroy"
video: fbdev-MMP: Fix typos for the word "destroy"
f2fs: Fix typos for the word "destroy" in jump labels
video: fbdev-MMP: Fix a typo for the word "destroyed"
Documentation-SCSI: Fix a typo for the word "destroy"

  Documentation/scsi/ChangeLog.lpfc | 2 +-
  drivers/scsi/isci/remote_device.c | 2 +-
  drivers/scsi/libfc/fc_fcp.c       | 4 ++--
  drivers/video/fbdev/mmp/core.c    | 6 +++---
  fs/f2fs/node.c                    | 8 ++++----
  5 files changed, 11 insertions(+), 11 deletions(-)
Signature · 1 line
~Randy