diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-03-09 19:16:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-09 20:01:09 -0500 |
| commit | 8a1115ff6b6d90cf1066ec3a0c4e51276553eebe (patch) | |
| tree | 6fbea49cf4add5e94470fce3a1637c2a384d7f13 | |
| parent | 6bbc4a4144b1a69743022ac68dfaf6e7d993abb9 (diff) | |
scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Fix typos and add the following to the scripts/spelling.txt:
disble||disable
disbled||disabled
I kept the TSL2563_INT_DISBLED in /drivers/iio/light/tsl2563.c
untouched. The macro is not referenced at all, but this commit is
touching only comment blocks just in case.
Link: http://lkml.kernel.org/r/1481573103-11329-20-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-- | Documentation/dev-tools/kcov.rst | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/cryptocop.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/ux500/cryp/cryp.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 | ||||
| -rw-r--r-- | drivers/hv/channel.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/hisax/st5481_b.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge.h | 2 | ||||
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_core.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/legacy/inode.c | 3 | ||||
| -rw-r--r-- | drivers/usb/host/xhci.c | 4 | ||||
| -rw-r--r-- | include/linux/regulator/machine.h | 2 | ||||
| -rw-r--r-- | kernel/cgroup/cgroup.c | 2 | ||||
| -rw-r--r-- | kernel/events/core.c | 2 | ||||
| -rw-r--r-- | scripts/spelling.txt | 2 | ||||
| -rw-r--r-- | sound/soc/amd/acp-pcm-dma.c | 2 |
17 files changed, 19 insertions, 18 deletions
diff --git a/Documentation/dev-tools/kcov.rst b/Documentation/dev-tools/kcov.rst index 2c41b713841f..44886c91e112 100644 --- a/Documentation/dev-tools/kcov.rst +++ b/Documentation/dev-tools/kcov.rst | |||
| @@ -10,7 +10,7 @@ Note that kcov does not aim to collect as much coverage as possible. It aims | |||
| 10 | to collect more or less stable coverage that is function of syscall inputs. | 10 | to collect more or less stable coverage that is function of syscall inputs. |
| 11 | To achieve this goal it does not collect coverage in soft/hard interrupts | 11 | To achieve this goal it does not collect coverage in soft/hard interrupts |
| 12 | and instrumentation of some inherently non-deterministic parts of kernel is | 12 | and instrumentation of some inherently non-deterministic parts of kernel is |
| 13 | disbled (e.g. scheduler, locking). | 13 | disabled (e.g. scheduler, locking). |
| 14 | 14 | ||
| 15 | Usage | 15 | Usage |
| 16 | ----- | 16 | ----- |
diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c index ae6903d7fdbe..14970f11bbf2 100644 --- a/arch/cris/arch-v32/drivers/cryptocop.c +++ b/arch/cris/arch-v32/drivers/cryptocop.c | |||
| @@ -2086,7 +2086,7 @@ static void cryptocop_job_queue_close(void) | |||
| 2086 | dma_in_cfg.en = regk_dma_no; | 2086 | dma_in_cfg.en = regk_dma_no; |
| 2087 | REG_WR(dma, IN_DMA_INST, rw_cfg, dma_in_cfg); | 2087 | REG_WR(dma, IN_DMA_INST, rw_cfg, dma_in_cfg); |
| 2088 | 2088 | ||
| 2089 | /* Disble the cryptocop. */ | 2089 | /* Disable the cryptocop. */ |
| 2090 | rw_cfg = REG_RD(strcop, regi_strcop, rw_cfg); | 2090 | rw_cfg = REG_RD(strcop, regi_strcop, rw_cfg); |
| 2091 | rw_cfg.en = 0; | 2091 | rw_cfg.en = 0; |
| 2092 | REG_WR(strcop, regi_strcop, rw_cfg, rw_cfg); | 2092 | REG_WR(strcop, regi_strcop, rw_cfg, rw_cfg); |
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 8639bb2ae058..8f3d9cf26ff9 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c | |||
| @@ -535,7 +535,7 @@ static void run_sync(void) | |||
| 535 | { | 535 | { |
| 536 | int enable_irqs = irqs_disabled(); | 536 | int enable_irqs = irqs_disabled(); |
| 537 | 537 | ||
| 538 | /* We may be called with interrupts disbled (on bootup). */ | 538 | /* We may be called with interrupts disabled (on bootup). */ |
| 539 | if (enable_irqs) | 539 | if (enable_irqs) |
| 540 | local_irq_enable(); | 540 | local_irq_enable(); |
| 541 | on_each_cpu(do_sync_core, NULL, 1); | 541 | on_each_cpu(do_sync_core, NULL, 1); |
diff --git a/drivers/crypto/ux500/cryp/cryp.c b/drivers/crypto/ux500/cryp/cryp.c index 43a0c8a26ab0..00a16ab601cb 100644 --- a/drivers/crypto/ux500/cryp/cryp.c +++ b/drivers/crypto/ux500/cryp/cryp.c | |||
| @@ -82,7 +82,7 @@ void cryp_activity(struct cryp_device_data *device_data, | |||
| 82 | void cryp_flush_inoutfifo(struct cryp_device_data *device_data) | 82 | void cryp_flush_inoutfifo(struct cryp_device_data *device_data) |
| 83 | { | 83 | { |
| 84 | /* | 84 | /* |
| 85 | * We always need to disble the hardware before trying to flush the | 85 | * We always need to disable the hardware before trying to flush the |
| 86 | * FIFO. This is something that isn't written in the design | 86 | * FIFO. This is something that isn't written in the design |
| 87 | * specification, but we have been informed by the hardware designers | 87 | * specification, but we have been informed by the hardware designers |
| 88 | * that this must be done. | 88 | * that this must be done. |
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c index 31375bdde6f1..011800f621c6 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | |||
| @@ -788,7 +788,7 @@ static int sdma_v3_0_start(struct amdgpu_device *adev) | |||
| 788 | } | 788 | } |
| 789 | } | 789 | } |
| 790 | 790 | ||
| 791 | /* disble sdma engine before programing it */ | 791 | /* disable sdma engine before programing it */ |
| 792 | sdma_v3_0_ctx_switch_enable(adev, false); | 792 | sdma_v3_0_ctx_switch_enable(adev, false); |
| 793 | sdma_v3_0_enable(adev, false); | 793 | sdma_v3_0_enable(adev, false); |
| 794 | 794 | ||
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index 81a80c82f1bd..bd0d1988feb2 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c | |||
| @@ -543,7 +543,7 @@ static int vmbus_close_internal(struct vmbus_channel *channel) | |||
| 543 | /* | 543 | /* |
| 544 | * In case a device driver's probe() fails (e.g., | 544 | * In case a device driver's probe() fails (e.g., |
| 545 | * util_probe() -> vmbus_open() returns -ENOMEM) and the device is | 545 | * util_probe() -> vmbus_open() returns -ENOMEM) and the device is |
| 546 | * rescinded later (e.g., we dynamically disble an Integrated Service | 546 | * rescinded later (e.g., we dynamically disable an Integrated Service |
| 547 | * in Hyper-V Manager), the driver's remove() invokes vmbus_close(): | 547 | * in Hyper-V Manager), the driver's remove() invokes vmbus_close(): |
| 548 | * here we should skip most of the below cleanup work. | 548 | * here we should skip most of the below cleanup work. |
| 549 | */ | 549 | */ |
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c index 409849165838..f64a36007800 100644 --- a/drivers/isdn/hisax/st5481_b.c +++ b/drivers/isdn/hisax/st5481_b.c | |||
| @@ -239,7 +239,7 @@ static void st5481B_mode(struct st5481_bcs *bcs, int mode) | |||
| 239 | } | 239 | } |
| 240 | } | 240 | } |
| 241 | } else { | 241 | } else { |
| 242 | // Disble B channel interrupts | 242 | // Disable B channel interrupts |
| 243 | st5481_usb_device_ctrl_msg(adapter, FFMSK_B1+(bcs->channel * 2), 0, NULL, NULL); | 243 | st5481_usb_device_ctrl_msg(adapter, FFMSK_B1+(bcs->channel * 2), 0, NULL, NULL); |
| 244 | 244 | ||
| 245 | // Disable B channel FIFOs | 245 | // Disable B channel FIFOs |
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 1ae872bfc3ba..747645c74134 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c | |||
| @@ -186,7 +186,7 @@ static inline int write_enable(struct spi_nor *nor) | |||
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | /* | 188 | /* |
| 189 | * Send write disble instruction to the chip. | 189 | * Send write disable instruction to the chip. |
| 190 | */ | 190 | */ |
| 191 | static inline int write_disable(struct spi_nor *nor) | 191 | static inline int write_disable(struct spi_nor *nor) |
| 192 | { | 192 | { |
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h index 6d31f92ef2b6..90b3b46f85cc 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge.h +++ b/drivers/net/ethernet/qlogic/qlge/qlge.h | |||
| @@ -1163,7 +1163,7 @@ struct ib_mac_iocb_rsp { | |||
| 1163 | u8 opcode; /* 0x20 */ | 1163 | u8 opcode; /* 0x20 */ |
| 1164 | u8 flags1; | 1164 | u8 flags1; |
| 1165 | #define IB_MAC_IOCB_RSP_OI 0x01 /* Overide intr delay */ | 1165 | #define IB_MAC_IOCB_RSP_OI 0x01 /* Overide intr delay */ |
| 1166 | #define IB_MAC_IOCB_RSP_I 0x02 /* Disble Intr Generation */ | 1166 | #define IB_MAC_IOCB_RSP_I 0x02 /* Disable Intr Generation */ |
| 1167 | #define IB_MAC_CSUM_ERR_MASK 0x1c /* A mask to use for csum errs */ | 1167 | #define IB_MAC_CSUM_ERR_MASK 0x1c /* A mask to use for csum errs */ |
| 1168 | #define IB_MAC_IOCB_RSP_TE 0x04 /* Checksum error */ | 1168 | #define IB_MAC_IOCB_RSP_TE 0x04 /* Checksum error */ |
| 1169 | #define IB_MAC_IOCB_RSP_NU 0x08 /* No checksum rcvd */ | 1169 | #define IB_MAC_IOCB_RSP_NU 0x08 /* No checksum rcvd */ |
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c index 109e2c99e6c1..95d8f25cbcca 100644 --- a/drivers/scsi/aic7xxx/aic79xx_core.c +++ b/drivers/scsi/aic7xxx/aic79xx_core.c | |||
| @@ -6278,7 +6278,7 @@ ahd_reset(struct ahd_softc *ahd, int reinit) | |||
| 6278 | * does not disable its parity logic prior to | 6278 | * does not disable its parity logic prior to |
| 6279 | * the start of the reset. This may cause a | 6279 | * the start of the reset. This may cause a |
| 6280 | * parity error to be detected and thus a | 6280 | * parity error to be detected and thus a |
| 6281 | * spurious SERR or PERR assertion. Disble | 6281 | * spurious SERR or PERR assertion. Disable |
| 6282 | * PERR and SERR responses during the CHIPRST. | 6282 | * PERR and SERR responses during the CHIPRST. |
| 6283 | */ | 6283 | */ |
| 6284 | mod_cmd = cmd & ~(PCIM_CMD_PERRESPEN|PCIM_CMD_SERRESPEN); | 6284 | mod_cmd = cmd & ~(PCIM_CMD_PERRESPEN|PCIM_CMD_SERRESPEN); |
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c index a2615d64d07c..79a2d8fba6b6 100644 --- a/drivers/usb/gadget/legacy/inode.c +++ b/drivers/usb/gadget/legacy/inode.c | |||
| @@ -84,8 +84,7 @@ static int ep_open(struct inode *, struct file *); | |||
| 84 | 84 | ||
| 85 | /* /dev/gadget/$CHIP represents ep0 and the whole device */ | 85 | /* /dev/gadget/$CHIP represents ep0 and the whole device */ |
| 86 | enum ep0_state { | 86 | enum ep0_state { |
| 87 | /* DISBLED is the initial state. | 87 | /* DISABLED is the initial state. */ |
| 88 | */ | ||
| 89 | STATE_DEV_DISABLED = 0, | 88 | STATE_DEV_DISABLED = 0, |
| 90 | 89 | ||
| 91 | /* Only one open() of /dev/gadget/$CHIP; only one file tracks | 90 | /* Only one open() of /dev/gadget/$CHIP; only one file tracks |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 6d6c46000e56..50aee8b7718b 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
| @@ -868,7 +868,7 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci) | |||
| 868 | 868 | ||
| 869 | spin_lock_irqsave(&xhci->lock, flags); | 869 | spin_lock_irqsave(&xhci->lock, flags); |
| 870 | 870 | ||
| 871 | /* disble usb3 ports Wake bits*/ | 871 | /* disable usb3 ports Wake bits */ |
| 872 | port_index = xhci->num_usb3_ports; | 872 | port_index = xhci->num_usb3_ports; |
| 873 | port_array = xhci->usb3_ports; | 873 | port_array = xhci->usb3_ports; |
| 874 | while (port_index--) { | 874 | while (port_index--) { |
| @@ -879,7 +879,7 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci) | |||
| 879 | writel(t2, port_array[port_index]); | 879 | writel(t2, port_array[port_index]); |
| 880 | } | 880 | } |
| 881 | 881 | ||
| 882 | /* disble usb2 ports Wake bits*/ | 882 | /* disable usb2 ports Wake bits */ |
| 883 | port_index = xhci->num_usb2_ports; | 883 | port_index = xhci->num_usb2_ports; |
| 884 | port_array = xhci->usb2_ports; | 884 | port_array = xhci->usb2_ports; |
| 885 | while (port_index--) { | 885 | while (port_index--) { |
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index ad3e5158e586..c9f795e9a2ee 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h | |||
| @@ -65,7 +65,7 @@ struct regulator_state { | |||
| 65 | int uV; /* suspend voltage */ | 65 | int uV; /* suspend voltage */ |
| 66 | unsigned int mode; /* suspend regulator operating mode */ | 66 | unsigned int mode; /* suspend regulator operating mode */ |
| 67 | int enabled; /* is regulator enabled in this suspend state */ | 67 | int enabled; /* is regulator enabled in this suspend state */ |
| 68 | int disabled; /* is the regulator disbled in this suspend state */ | 68 | int disabled; /* is the regulator disabled in this suspend state */ |
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | /** | 71 | /** |
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 0125589c7428..48851327a15e 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c | |||
| @@ -2669,7 +2669,7 @@ static bool css_visible(struct cgroup_subsys_state *css) | |||
| 2669 | * | 2669 | * |
| 2670 | * Returns 0 on success, -errno on failure. On failure, csses which have | 2670 | * Returns 0 on success, -errno on failure. On failure, csses which have |
| 2671 | * been processed already aren't cleaned up. The caller is responsible for | 2671 | * been processed already aren't cleaned up. The caller is responsible for |
| 2672 | * cleaning up with cgroup_apply_control_disble(). | 2672 | * cleaning up with cgroup_apply_control_disable(). |
| 2673 | */ | 2673 | */ |
| 2674 | static int cgroup_apply_control_enable(struct cgroup *cgrp) | 2674 | static int cgroup_apply_control_enable(struct cgroup *cgrp) |
| 2675 | { | 2675 | { |
diff --git a/kernel/events/core.c b/kernel/events/core.c index 6f41548f2e32..a17ed56c8ce1 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
| @@ -998,7 +998,7 @@ list_update_cgroup_event(struct perf_event *event, | |||
| 998 | */ | 998 | */ |
| 999 | #define PERF_CPU_HRTIMER (1000 / HZ) | 999 | #define PERF_CPU_HRTIMER (1000 / HZ) |
| 1000 | /* | 1000 | /* |
| 1001 | * function must be called with interrupts disbled | 1001 | * function must be called with interrupts disabled |
| 1002 | */ | 1002 | */ |
| 1003 | static enum hrtimer_restart perf_mux_hrtimer_handler(struct hrtimer *hr) | 1003 | static enum hrtimer_restart perf_mux_hrtimer_handler(struct hrtimer *hr) |
| 1004 | { | 1004 | { |
diff --git a/scripts/spelling.txt b/scripts/spelling.txt index 0458b037c8a1..6dae4df472f6 100644 --- a/scripts/spelling.txt +++ b/scripts/spelling.txt | |||
| @@ -372,6 +372,8 @@ disassocation||disassociation | |||
| 372 | disapear||disappear | 372 | disapear||disappear |
| 373 | disapeared||disappeared | 373 | disapeared||disappeared |
| 374 | disappared||disappeared | 374 | disappared||disappeared |
| 375 | disble||disable | ||
| 376 | disbled||disabled | ||
| 375 | disconnet||disconnect | 377 | disconnet||disconnect |
| 376 | discontinous||discontinuous | 378 | discontinous||discontinuous |
| 377 | dispertion||dispersion | 379 | dispertion||dispersion |
diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index ec1067a679da..08b1399d1da2 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c | |||
| @@ -89,7 +89,7 @@ static void acp_reg_write(u32 val, void __iomem *acp_mmio, u32 reg) | |||
| 89 | writel(val, acp_mmio + (reg * 4)); | 89 | writel(val, acp_mmio + (reg * 4)); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | /* Configure a given dma channel parameters - enable/disble, | 92 | /* Configure a given dma channel parameters - enable/disable, |
| 93 | * number of descriptors, priority | 93 | * number of descriptors, priority |
| 94 | */ | 94 | */ |
| 95 | static void config_acp_dma_channel(void __iomem *acp_mmio, u8 ch_num, | 95 | static void config_acp_dma_channel(void __iomem *acp_mmio, u8 ch_num, |
