diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-02-27 17:29:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-27 21:43:47 -0500 |
commit | 03671057c3b769c0adbf9212bf695481d3f59279 (patch) | |
tree | c944609f7daccef0a21a635fd9dde366151944eb | |
parent | 3f8b6fb7f279c769c0973431be1cd7f15e8b2755 (diff) |
scripts/spelling.txt: add "overrided" pattern and fix typo instances
Fix typos and add the following to the scripts/spelling.txt:
overrided||overridden
Link: http://lkml.kernel.org/r/1481573103-11329-22-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/acpi/method-customizing.txt | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda.c | 2 | ||||
-rw-r--r-- | drivers/acpi/resource.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/ksz884x.c | 8 | ||||
-rw-r--r-- | drivers/pinctrl/bcm/Kconfig | 2 | ||||
-rw-r--r-- | scripts/spelling.txt | 1 | ||||
-rw-r--r-- | tools/lib/bpf/bpf.c | 2 |
9 files changed, 12 insertions, 11 deletions
diff --git a/Documentation/acpi/method-customizing.txt b/Documentation/acpi/method-customizing.txt index 5f55373dd53b..a3f598e141f2 100644 --- a/Documentation/acpi/method-customizing.txt +++ b/Documentation/acpi/method-customizing.txt | |||
@@ -57,7 +57,7 @@ Note: To get the ACPI debug object output (Store (AAAA, Debug)), | |||
57 | 3. undo your changes | 57 | 3. undo your changes |
58 | The "undo" operation is not supported for a new inserted method | 58 | The "undo" operation is not supported for a new inserted method |
59 | right now, i.e. we can not remove a method currently. | 59 | right now, i.e. we can not remove a method currently. |
60 | For an overrided method, in order to undo your changes, please | 60 | For an overridden method, in order to undo your changes, please |
61 | save a copy of the method original ASL code in step c) section 1, | 61 | save a copy of the method original ASL code in step c) section 1, |
62 | and redo step c) ~ g) to override the method with the original one. | 62 | and redo step c) ~ g) to override the method with the original one. |
63 | 63 | ||
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 8278f43ad4b8..e0f83c204ccc 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c | |||
@@ -3034,7 +3034,7 @@ static void pnv_ioda_setup_pe_res(struct pnv_ioda_pe *pe, | |||
3034 | /* | 3034 | /* |
3035 | * This function is supposed to be called on basis of PE from top | 3035 | * This function is supposed to be called on basis of PE from top |
3036 | * to bottom style. So the the I/O or MMIO segment assigned to | 3036 | * to bottom style. So the the I/O or MMIO segment assigned to |
3037 | * parent PE could be overrided by its child PEs if necessary. | 3037 | * parent PE could be overridden by its child PEs if necessary. |
3038 | */ | 3038 | */ |
3039 | static void pnv_ioda_setup_pe_seg(struct pnv_ioda_pe *pe) | 3039 | static void pnv_ioda_setup_pe_seg(struct pnv_ioda_pe *pe) |
3040 | { | 3040 | { |
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 8b11d6d385dc..cd4c4271dc4c 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c | |||
@@ -406,7 +406,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, | |||
406 | } | 406 | } |
407 | 407 | ||
408 | /* | 408 | /* |
409 | * In IO-APIC mode, use overrided attribute. Two reasons: | 409 | * In IO-APIC mode, use overridden attribute. Two reasons: |
410 | * 1. BIOS bug in DSDT | 410 | * 1. BIOS bug in DSDT |
411 | * 2. BIOS uses IO-APIC mode Interrupt Source Override | 411 | * 2. BIOS uses IO-APIC mode Interrupt Source Override |
412 | * | 412 | * |
diff --git a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h index 26129972f686..80ed65985af8 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h +++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | |||
@@ -89,7 +89,7 @@ enum phm_platform_caps { | |||
89 | PHM_PlatformCaps_EnableSideportControl, /* indicates Sideport can be controlled */ | 89 | PHM_PlatformCaps_EnableSideportControl, /* indicates Sideport can be controlled */ |
90 | PHM_PlatformCaps_VideoPlaybackEEUNotification, /* indicates EEU notification of video start/stop is required */ | 90 | PHM_PlatformCaps_VideoPlaybackEEUNotification, /* indicates EEU notification of video start/stop is required */ |
91 | PHM_PlatformCaps_TurnOffPll_ASPML1, /* PCIE Turn Off PLL in ASPM L1 */ | 91 | PHM_PlatformCaps_TurnOffPll_ASPML1, /* PCIE Turn Off PLL in ASPM L1 */ |
92 | PHM_PlatformCaps_EnableHTLinkControl, /* indicates HT Link can be controlled by ACPI or CLMC overrided/automated mode. */ | 92 | PHM_PlatformCaps_EnableHTLinkControl, /* indicates HT Link can be controlled by ACPI or CLMC overridden/automated mode. */ |
93 | PHM_PlatformCaps_PerformanceStateOnly, /* indicates only performance power state to be used on current system. */ | 93 | PHM_PlatformCaps_PerformanceStateOnly, /* indicates only performance power state to be used on current system. */ |
94 | PHM_PlatformCaps_ExclusiveModeAlwaysHigh, /* In Exclusive (3D) mode always stay in High state. */ | 94 | PHM_PlatformCaps_ExclusiveModeAlwaysHigh, /* In Exclusive (3D) mode always stay in High state. */ |
95 | PHM_PlatformCaps_DisableMGClockGating, /* to disable Medium Grain Clock Gating or not */ | 95 | PHM_PlatformCaps_DisableMGClockGating, /* to disable Medium Grain Clock Gating or not */ |
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 0ee6e208aa07..50d88d3e03b6 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c | |||
@@ -817,7 +817,7 @@ static void bcm_enet_adjust_phy_link(struct net_device *dev) | |||
817 | rx_pause_en = 1; | 817 | rx_pause_en = 1; |
818 | tx_pause_en = 1; | 818 | tx_pause_en = 1; |
819 | } else if (!priv->pause_auto) { | 819 | } else if (!priv->pause_auto) { |
820 | /* pause setting overrided by user */ | 820 | /* pause setting overridden by user */ |
821 | rx_pause_en = priv->pause_rx; | 821 | rx_pause_en = priv->pause_rx; |
822 | tx_pause_en = priv->pause_tx; | 822 | tx_pause_en = priv->pause_tx; |
823 | } else { | 823 | } else { |
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index ee38c18c2d2d..ee1c78abab0b 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c | |||
@@ -1251,10 +1251,10 @@ struct ksz_port_info { | |||
1251 | * @tx_size: Transmit data size. Used for TX optimization. | 1251 | * @tx_size: Transmit data size. Used for TX optimization. |
1252 | * The maximum is defined by MAX_TX_HELD_SIZE. | 1252 | * The maximum is defined by MAX_TX_HELD_SIZE. |
1253 | * @perm_addr: Permanent MAC address. | 1253 | * @perm_addr: Permanent MAC address. |
1254 | * @override_addr: Overrided MAC address. | 1254 | * @override_addr: Overridden MAC address. |
1255 | * @address: Additional MAC address entries. | 1255 | * @address: Additional MAC address entries. |
1256 | * @addr_list_size: Additional MAC address list size. | 1256 | * @addr_list_size: Additional MAC address list size. |
1257 | * @mac_override: Indication of MAC address overrided. | 1257 | * @mac_override: Indication of MAC address overridden. |
1258 | * @promiscuous: Counter to keep track of promiscuous mode set. | 1258 | * @promiscuous: Counter to keep track of promiscuous mode set. |
1259 | * @all_multi: Counter to keep track of all multicast mode set. | 1259 | * @all_multi: Counter to keep track of all multicast mode set. |
1260 | * @multi_list: Multicast address entries. | 1260 | * @multi_list: Multicast address entries. |
@@ -4042,7 +4042,7 @@ static int empty_addr(u8 *addr) | |||
4042 | * @hw: The hardware instance. | 4042 | * @hw: The hardware instance. |
4043 | * | 4043 | * |
4044 | * This routine programs the MAC address of the hardware when the address is | 4044 | * This routine programs the MAC address of the hardware when the address is |
4045 | * overrided. | 4045 | * overridden. |
4046 | */ | 4046 | */ |
4047 | static void hw_set_addr(struct ksz_hw *hw) | 4047 | static void hw_set_addr(struct ksz_hw *hw) |
4048 | { | 4048 | { |
@@ -7043,7 +7043,7 @@ static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id) | |||
7043 | if (macaddr[0] != ':') | 7043 | if (macaddr[0] != ':') |
7044 | get_mac_addr(hw_priv, macaddr, MAIN_PORT); | 7044 | get_mac_addr(hw_priv, macaddr, MAIN_PORT); |
7045 | 7045 | ||
7046 | /* Read MAC address and initialize override address if not overrided. */ | 7046 | /* Read MAC address and initialize override address if not overridden. */ |
7047 | hw_read_addr(hw); | 7047 | hw_read_addr(hw); |
7048 | 7048 | ||
7049 | /* Multiple device interfaces mode requires a second MAC address. */ | 7049 | /* Multiple device interfaces mode requires a second MAC address. */ |
diff --git a/drivers/pinctrl/bcm/Kconfig b/drivers/pinctrl/bcm/Kconfig index 8968dd7aebed..e8c4e4f934a6 100644 --- a/drivers/pinctrl/bcm/Kconfig +++ b/drivers/pinctrl/bcm/Kconfig | |||
@@ -70,7 +70,7 @@ config PINCTRL_CYGNUS_MUX | |||
70 | 70 | ||
71 | The Broadcom Cygnus IOMUX driver supports group based IOMUX | 71 | The Broadcom Cygnus IOMUX driver supports group based IOMUX |
72 | configuration, with the exception that certain individual pins | 72 | configuration, with the exception that certain individual pins |
73 | can be overrided to GPIO function | 73 | can be overridden to GPIO function |
74 | 74 | ||
75 | config PINCTRL_NSP_GPIO | 75 | config PINCTRL_NSP_GPIO |
76 | bool "Broadcom NSP GPIO (with PINCONF) driver" | 76 | bool "Broadcom NSP GPIO (with PINCONF) driver" |
diff --git a/scripts/spelling.txt b/scripts/spelling.txt index f9564f6ece20..a3e652179c14 100644 --- a/scripts/spelling.txt +++ b/scripts/spelling.txt | |||
@@ -721,6 +721,7 @@ oustanding||outstanding | |||
721 | overaall||overall | 721 | overaall||overall |
722 | overhread||overhead | 722 | overhread||overhead |
723 | overlaping||overlapping | 723 | overlaping||overlapping |
724 | overrided||overridden | ||
724 | overriden||overridden | 725 | overriden||overridden |
725 | overun||overrun | 726 | overun||overrun |
726 | pacakge||package | 727 | pacakge||package |
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index d48b70ceb25a..207c2eeddab0 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "bpf.h" | 27 | #include "bpf.h" |
28 | 28 | ||
29 | /* | 29 | /* |
30 | * When building perf, unistd.h is overrided. __NR_bpf is | 30 | * When building perf, unistd.h is overridden. __NR_bpf is |
31 | * required to be defined explicitly. | 31 | * required to be defined explicitly. |
32 | */ | 32 | */ |
33 | #ifndef __NR_bpf | 33 | #ifndef __NR_bpf |