aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-02-27 17:29:48 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-27 21:43:47 -0500
commit9a284e5c9e04a3533f72eda8956162dfc77684a9 (patch)
treea6dac7e9fa7c62780a8438f904b45caa551b42b6
parent1cce200081d182e0ae6b40bcb1cfdecfdfc09fe4 (diff)
scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Fix typos and add the following to the scripts/spelling.txt: overwritting||overwriting Link: http://lkml.kernel.org/r/1481573103-11329-29-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--arch/arm64/lib/copy_template.S2
-rw-r--r--drivers/net/ethernet/adi/bfin_mac.c2
-rw-r--r--drivers/net/ethernet/intel/igb/e1000_phy.c2
-rw-r--r--drivers/scsi/mpt3sas/mpt3sas_ctl.c2
-rw-r--r--drivers/scsi/mpt3sas/mpt3sas_ctl.h2
-rw-r--r--drivers/usb/usbip/usbip_common.c2
-rw-r--r--scripts/spelling.txt1
7 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm64/lib/copy_template.S b/arch/arm64/lib/copy_template.S
index 410fbdb8163f..f5b9210f1c83 100644
--- a/arch/arm64/lib/copy_template.S
+++ b/arch/arm64/lib/copy_template.S
@@ -62,7 +62,7 @@ D_h .req x14
62 sub count, count, tmp2 62 sub count, count, tmp2
63 /* 63 /*
64 * Copy the leading memory data from src to dst in an increasing 64 * Copy the leading memory data from src to dst in an increasing
65 * address order.By this way,the risk of overwritting the source 65 * address order.By this way,the risk of overwriting the source
66 * memory data is eliminated when the distance between src and 66 * memory data is eliminated when the distance between src and
67 * dst is less than 16. The memory accesses here are alignment. 67 * dst is less than 16. The memory accesses here are alignment.
68 */ 68 */
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index a81731303730..a9ac58c351a0 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -1206,7 +1206,7 @@ static void bfin_mac_rx(struct bfin_mac_local *lp)
1206 /* reserve 2 bytes for RXDWA padding */ 1206 /* reserve 2 bytes for RXDWA padding */
1207 skb_reserve(new_skb, NET_IP_ALIGN); 1207 skb_reserve(new_skb, NET_IP_ALIGN);
1208 /* Invalidate the data cache of skb->data range when it is write back 1208 /* Invalidate the data cache of skb->data range when it is write back
1209 * cache. It will prevent overwritting the new data from DMA 1209 * cache. It will prevent overwriting the new data from DMA
1210 */ 1210 */
1211 blackfin_dcache_invalidate_range((unsigned long)new_skb->head, 1211 blackfin_dcache_invalidate_range((unsigned long)new_skb->head,
1212 (unsigned long)new_skb->end); 1212 (unsigned long)new_skb->end);
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 2788a5409023..68812d783f33 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -294,7 +294,7 @@ s32 igb_write_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 data)
294 u32 i, i2ccmd = 0; 294 u32 i, i2ccmd = 0;
295 u16 phy_data_swapped; 295 u16 phy_data_swapped;
296 296
297 /* Prevent overwritting SFP I2C EEPROM which is at A0 address.*/ 297 /* Prevent overwriting SFP I2C EEPROM which is at A0 address.*/
298 if ((hw->phy.addr == 0) || (hw->phy.addr > 7)) { 298 if ((hw->phy.addr == 0) || (hw->phy.addr > 7)) {
299 hw_dbg("PHY I2C Address %d is out of range.\n", 299 hw_dbg("PHY I2C Address %d is out of range.\n",
300 hw->phy.addr); 300 hw->phy.addr);
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index 02fe1c4aae2f..bdffb692bded 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -1925,7 +1925,7 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type,
1925 * 1925 *
1926 * This allows ownership of the specified buffer to returned to the driver, 1926 * This allows ownership of the specified buffer to returned to the driver,
1927 * allowing an application to read the buffer without fear that firmware is 1927 * allowing an application to read the buffer without fear that firmware is
1928 * overwritting information in the buffer. 1928 * overwriting information in the buffer.
1929 */ 1929 */
1930static long 1930static long
1931_ctl_diag_release(struct MPT3SAS_ADAPTER *ioc, void __user *arg) 1931_ctl_diag_release(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.h b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
index f3e17a8c1b07..a44046cff0f3 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
@@ -390,7 +390,7 @@ struct mpt3_diag_query {
390 * 390 *
391 * This allows ownership of the specified buffer to returned to the driver, 391 * This allows ownership of the specified buffer to returned to the driver,
392 * allowing an application to read the buffer without fear that firmware is 392 * allowing an application to read the buffer without fear that firmware is
393 * overwritting information in the buffer. 393 * overwriting information in the buffer.
394 */ 394 */
395struct mpt3_diag_release { 395struct mpt3_diag_release {
396 struct mpt3_ioctl_header hdr; 396 struct mpt3_ioctl_header hdr;
diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c
index 8b232290be6b..1a6f78d7d027 100644
--- a/drivers/usb/usbip/usbip_common.c
+++ b/drivers/usb/usbip/usbip_common.c
@@ -707,7 +707,7 @@ void usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
707 return; 707 return;
708 708
709 /* 709 /*
710 * loop over all packets from last to first (to prevent overwritting 710 * loop over all packets from last to first (to prevent overwriting
711 * memory when padding) and move them into the proper place 711 * memory when padding) and move them into the proper place
712 */ 712 */
713 for (i = np-1; i > 0; i--) { 713 for (i = np-1; i > 0; i--) {
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index ea01f005cf38..28753c25f436 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -733,6 +733,7 @@ overlaping||overlapping
733overrided||overridden 733overrided||overridden
734overriden||overridden 734overriden||overridden
735overun||overrun 735overun||overrun
736overwritting||overwriting
736pacakge||package 737pacakge||package
737pachage||package 738pachage||package
738packacge||package 739packacge||package