diff options
52 files changed, 92 insertions, 92 deletions
diff --git a/Documentation/devicetree/bindings/clock/st/st,flexgen.txt b/Documentation/devicetree/bindings/clock/st/st,flexgen.txt index 1d3ace088172..b7ee5c7e0f75 100644 --- a/Documentation/devicetree/bindings/clock/st/st,flexgen.txt +++ b/Documentation/devicetree/bindings/clock/st/st,flexgen.txt | |||
| @@ -11,7 +11,7 @@ Please find an example below: | |||
| 11 | 11 | ||
| 12 | Clockgen block diagram | 12 | Clockgen block diagram |
| 13 | ------------------------------------------------------------------- | 13 | ------------------------------------------------------------------- |
| 14 | | Flexgen stucture | | 14 | | Flexgen structure | |
| 15 | | --------------------------------------------- | | 15 | | --------------------------------------------- | |
| 16 | | | ------- -------- -------- | | | 16 | | | ------- -------- -------- | | |
| 17 | clk_sysin | | | | | | | | | | 17 | clk_sysin | | | | | | | | | |
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt index a0c85110a07e..8638f61c8c9d 100644 --- a/Documentation/scsi/scsi_eh.txt +++ b/Documentation/scsi/scsi_eh.txt | |||
| @@ -172,7 +172,7 @@ ways. | |||
| 172 | 172 | ||
| 173 | - eh_strategy_handler() callback | 173 | - eh_strategy_handler() callback |
| 174 | This is one big callback which should perform whole error | 174 | This is one big callback which should perform whole error |
| 175 | handling. As such, it should do all choirs SCSI midlayer | 175 | handling. As such, it should do all chores the SCSI midlayer |
| 176 | performs during recovery. This will be discussed in [2-2]. | 176 | performs during recovery. This will be discussed in [2-2]. |
| 177 | 177 | ||
| 178 | Once recovery is complete, SCSI EH resumes normal operation by | 178 | Once recovery is complete, SCSI EH resumes normal operation by |
| @@ -428,7 +428,7 @@ scmd->allowed. | |||
| 428 | scsi_unjam_host() and it is responsible for whole recovery process. | 428 | scsi_unjam_host() and it is responsible for whole recovery process. |
| 429 | On completion, the handler should have made lower layers forget about | 429 | On completion, the handler should have made lower layers forget about |
| 430 | all failed scmds and either ready for new commands or offline. Also, | 430 | all failed scmds and either ready for new commands or offline. Also, |
| 431 | it should perform SCSI EH maintenance choirs to maintain integrity of | 431 | it should perform SCSI EH maintenance chores to maintain integrity of |
| 432 | SCSI midlayer. IOW, of the steps described in [2-1-2], all steps | 432 | SCSI midlayer. IOW, of the steps described in [2-1-2], all steps |
| 433 | except for #1 must be implemented by eh_strategy_handler(). | 433 | except for #1 must be implemented by eh_strategy_handler(). |
| 434 | 434 | ||
diff --git a/Documentation/usb/gadget_configfs.txt b/Documentation/usb/gadget_configfs.txt index 4cf53e406613..635e57493709 100644 --- a/Documentation/usb/gadget_configfs.txt +++ b/Documentation/usb/gadget_configfs.txt | |||
| @@ -376,7 +376,7 @@ functions and binds them. This way the whole gadget is bound. | |||
| 376 | configured, so config_groups for particular functions are defined | 376 | configured, so config_groups for particular functions are defined |
| 377 | in the functions implementation files drivers/usb/gadget/f_*.c. | 377 | in the functions implementation files drivers/usb/gadget/f_*.c. |
| 378 | 378 | ||
| 379 | 5. Funciton's code is written in such a way that it uses | 379 | 5. Function's code is written in such a way that it uses |
| 380 | 380 | ||
| 381 | usb_get_function_instance(), which, in turn, calls request_module. | 381 | usb_get_function_instance(), which, in turn, calls request_module. |
| 382 | So, provided that modprobe works, modules for particular functions | 382 | So, provided that modprobe works, modules for particular functions |
diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index f3bb2dd6269e..d2d8e94e0aa2 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi | |||
| @@ -102,7 +102,7 @@ | |||
| 102 | twd_watchdog: watchdog@1e620 { | 102 | twd_watchdog: watchdog@1e620 { |
| 103 | compatible = "arm,cortex-a9-twd-wdt"; | 103 | compatible = "arm,cortex-a9-twd-wdt"; |
| 104 | reg = <0x1e620 0x20>; | 104 | reg = <0x1e620 0x20>; |
| 105 | interupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>; | 105 | interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>; |
| 106 | }; | 106 | }; |
| 107 | }; | 107 | }; |
| 108 | 108 | ||
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index b9e3f1c61baf..e4a00bafffc1 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
| @@ -34,7 +34,7 @@ config ARCH_EXYNOS3 | |||
| 34 | bool "SAMSUNG EXYNOS3" | 34 | bool "SAMSUNG EXYNOS3" |
| 35 | select ARM_CPU_SUSPEND if PM | 35 | select ARM_CPU_SUSPEND if PM |
| 36 | help | 36 | help |
| 37 | Samsung EXYNOS3 (Crotex-A7) SoC based systems | 37 | Samsung EXYNOS3 (Cortex-A7) SoC based systems |
| 38 | 38 | ||
| 39 | config ARCH_EXYNOS4 | 39 | config ARCH_EXYNOS4 |
| 40 | bool "SAMSUNG EXYNOS4" | 40 | bool "SAMSUNG EXYNOS4" |
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 5ebdb32d9a2b..94f888d3384e 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c | |||
| @@ -1092,7 +1092,7 @@ static int __init edac_devinit(void) | |||
| 1092 | name = edac_device_names[i]; | 1092 | name = edac_device_names[i]; |
| 1093 | dev = platform_device_register_simple(name, -1, NULL, 0); | 1093 | dev = platform_device_register_simple(name, -1, NULL, 0); |
| 1094 | if (IS_ERR(dev)) { | 1094 | if (IS_ERR(dev)) { |
| 1095 | pr_err("Registation of %s failed!\n", name); | 1095 | pr_err("Registration of %s failed!\n", name); |
| 1096 | err = PTR_ERR(dev); | 1096 | err = PTR_ERR(dev); |
| 1097 | } | 1097 | } |
| 1098 | } | 1098 | } |
| @@ -1103,7 +1103,7 @@ static int __init edac_devinit(void) | |||
| 1103 | dev = platform_device_register_simple("octeon_lmc_edac", | 1103 | dev = platform_device_register_simple("octeon_lmc_edac", |
| 1104 | i, NULL, 0); | 1104 | i, NULL, 0); |
| 1105 | if (IS_ERR(dev)) { | 1105 | if (IS_ERR(dev)) { |
| 1106 | pr_err("Registation of octeon_lmc_edac %d failed!\n", i); | 1106 | pr_err("Registration of octeon_lmc_edac %d failed!\n", i); |
| 1107 | err = PTR_ERR(dev); | 1107 | err = PTR_ERR(dev); |
| 1108 | } | 1108 | } |
| 1109 | } | 1109 | } |
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c index 59cccd95688b..d07e04121cc6 100644 --- a/arch/mips/pci/pci-octeon.c +++ b/arch/mips/pci/pci-octeon.c | |||
| @@ -708,7 +708,7 @@ static int __init octeon_pci_setup(void) | |||
| 708 | 708 | ||
| 709 | if (IS_ERR(platform_device_register_simple("octeon_pci_edac", | 709 | if (IS_ERR(platform_device_register_simple("octeon_pci_edac", |
| 710 | -1, NULL, 0))) | 710 | -1, NULL, 0))) |
| 711 | pr_err("Registation of co_pci_edac failed!\n"); | 711 | pr_err("Registration of co_pci_edac failed!\n"); |
| 712 | 712 | ||
| 713 | octeon_pci_dma_init(); | 713 | octeon_pci_dma_init(); |
| 714 | 714 | ||
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 769778f855b0..cc536d4a75ef 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c | |||
| @@ -661,7 +661,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type, | |||
| 661 | if (unlikely((pr && !(mas3 & MAS3_UX)) || | 661 | if (unlikely((pr && !(mas3 & MAS3_UX)) || |
| 662 | (!pr && !(mas3 & MAS3_SX)))) { | 662 | (!pr && !(mas3 & MAS3_SX)))) { |
| 663 | pr_err_ratelimited( | 663 | pr_err_ratelimited( |
| 664 | "%s: Instuction emulation from guest addres %08lx without execute permission\n", | 664 | "%s: Instruction emulation from guest address %08lx without execute permission\n", |
| 665 | __func__, geaddr); | 665 | __func__, geaddr); |
| 666 | return EMULATE_AGAIN; | 666 | return EMULATE_AGAIN; |
| 667 | } | 667 | } |
| @@ -673,7 +673,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type, | |||
| 673 | if (has_feature(vcpu, VCPU_FTR_MMU_V2) && | 673 | if (has_feature(vcpu, VCPU_FTR_MMU_V2) && |
| 674 | unlikely((mas2 & MAS2_I) || (mas2 & MAS2_W) || !(mas2 & MAS2_M))) { | 674 | unlikely((mas2 & MAS2_I) || (mas2 & MAS2_W) || !(mas2 & MAS2_M))) { |
| 675 | pr_err_ratelimited( | 675 | pr_err_ratelimited( |
| 676 | "%s: Instuction emulation from guest addres %08lx mismatches storage attributes\n", | 676 | "%s: Instruction emulation from guest address %08lx mismatches storage attributes\n", |
| 677 | __func__, geaddr); | 677 | __func__, geaddr); |
| 678 | return EMULATE_AGAIN; | 678 | return EMULATE_AGAIN; |
| 679 | } | 679 | } |
| @@ -686,7 +686,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type, | |||
| 686 | 686 | ||
| 687 | /* Guard against emulation from devices area */ | 687 | /* Guard against emulation from devices area */ |
| 688 | if (unlikely(!page_is_ram(pfn))) { | 688 | if (unlikely(!page_is_ram(pfn))) { |
| 689 | pr_err_ratelimited("%s: Instruction emulation from non-RAM host addres %08llx is not supported\n", | 689 | pr_err_ratelimited("%s: Instruction emulation from non-RAM host address %08llx is not supported\n", |
| 690 | __func__, addr); | 690 | __func__, addr); |
| 691 | return EMULATE_AGAIN; | 691 | return EMULATE_AGAIN; |
| 692 | } | 692 | } |
diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S index c46c876ac96a..92ee840529bc 100644 --- a/arch/powerpc/lib/copyuser_power7.S +++ b/arch/powerpc/lib/copyuser_power7.S | |||
| @@ -718,4 +718,4 @@ err3; stb r0,0(r3) | |||
| 718 | 718 | ||
| 719 | 15: addi r1,r1,STACKFRAMESIZE | 719 | 15: addi r1,r1,STACKFRAMESIZE |
| 720 | b exit_vmx_usercopy /* tail call optimise */ | 720 | b exit_vmx_usercopy /* tail call optimise */ |
| 721 | #endif /* CONFiG_ALTIVEC */ | 721 | #endif /* CONFIG_ALTIVEC */ |
diff --git a/arch/powerpc/lib/memcpy_power7.S b/arch/powerpc/lib/memcpy_power7.S index 2ff5c142f87b..0830587df16e 100644 --- a/arch/powerpc/lib/memcpy_power7.S +++ b/arch/powerpc/lib/memcpy_power7.S | |||
| @@ -653,4 +653,4 @@ _GLOBAL(memcpy_power7) | |||
| 653 | 15: addi r1,r1,STACKFRAMESIZE | 653 | 15: addi r1,r1,STACKFRAMESIZE |
| 654 | ld r3,-STACKFRAMESIZE+STK_REG(R31)(r1) | 654 | ld r3,-STACKFRAMESIZE+STK_REG(R31)(r1) |
| 655 | b exit_vmx_copy /* tail call optimise */ | 655 | b exit_vmx_copy /* tail call optimise */ |
| 656 | #endif /* CONFiG_ALTIVEC */ | 656 | #endif /* CONFIG_ALTIVEC */ |
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h index 9615d82919b8..78c45f392f5b 100644 --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h | |||
| @@ -67,7 +67,7 @@ static inline void _tlbil_va(unsigned long address, unsigned int pid, | |||
| 67 | { | 67 | { |
| 68 | __tlbil_va(address, pid); | 68 | __tlbil_va(address, pid); |
| 69 | } | 69 | } |
| 70 | #endif /* CONIFG_8xx */ | 70 | #endif /* CONFIG_8xx */ |
| 71 | 71 | ||
| 72 | #if defined(CONFIG_PPC_BOOK3E) || defined(CONFIG_PPC_47x) | 72 | #if defined(CONFIG_PPC_BOOK3E) || defined(CONFIG_PPC_47x) |
| 73 | extern void _tlbivax_bcast(unsigned long address, unsigned int pid, | 73 | extern void _tlbivax_bcast(unsigned long address, unsigned int pid, |
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 82f2da28cd27..d2ac1c116454 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig | |||
| @@ -220,7 +220,6 @@ config AKEBONO | |||
| 220 | select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD | 220 | select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD |
| 221 | select MMC_SDHCI | 221 | select MMC_SDHCI |
| 222 | select MMC_SDHCI_PLTFM | 222 | select MMC_SDHCI_PLTFM |
| 223 | select MMC_SDHCI_OF_476GTR | ||
| 224 | select ATA | 223 | select ATA |
| 225 | select SATA_AHCI_PLATFORM | 224 | select SATA_AHCI_PLATFORM |
| 226 | help | 225 | help |
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 455fd17d938e..3f44f292d066 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig | |||
| @@ -28,7 +28,7 @@ config COMMON_CLK_WM831X | |||
| 28 | depends on MFD_WM831X | 28 | depends on MFD_WM831X |
| 29 | ---help--- | 29 | ---help--- |
| 30 | Supports the clocking subsystem of the WM831x/2x series of | 30 | Supports the clocking subsystem of the WM831x/2x series of |
| 31 | PMICs from Wolfson Microlectronics. | 31 | PMICs from Wolfson Microelectronics. |
| 32 | 32 | ||
| 33 | source "drivers/clk/versatile/Kconfig" | 33 | source "drivers/clk/versatile/Kconfig" |
| 34 | 34 | ||
diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c index 9bc2720628a4..91ebe282b106 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c | |||
| @@ -197,7 +197,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) | |||
| 197 | 197 | ||
| 198 | ret = allocate_resources(policy->cpu, &cpu_dev, &cpu_reg, &cpu_clk); | 198 | ret = allocate_resources(policy->cpu, &cpu_dev, &cpu_reg, &cpu_clk); |
| 199 | if (ret) { | 199 | if (ret) { |
| 200 | pr_err("%s: Failed to allocate resources\n: %d", __func__, ret); | 200 | pr_err("%s: Failed to allocate resources: %d\n", __func__, ret); |
| 201 | return ret; | 201 | return ret; |
| 202 | } | 202 | } |
| 203 | 203 | ||
diff --git a/drivers/gpio/gpio-msm-v1.c b/drivers/gpio/gpio-msm-v1.c index 73b73969d361..997e61ef173c 100644 --- a/drivers/gpio/gpio-msm-v1.c +++ b/drivers/gpio/gpio-msm-v1.c | |||
| @@ -686,7 +686,7 @@ static int gpio_msm_v1_probe(struct platform_device *pdev) | |||
| 686 | irq_set_chained_handler(irq1, msm_gpio_irq_handler); | 686 | irq_set_chained_handler(irq1, msm_gpio_irq_handler); |
| 687 | irq_set_chained_handler(irq2, msm_gpio_irq_handler); | 687 | irq_set_chained_handler(irq2, msm_gpio_irq_handler); |
| 688 | irq_set_irq_wake(irq1, 1); | 688 | irq_set_irq_wake(irq1, 1); |
| 689 | irq_set_irq_wake(irq2, 2); | 689 | irq_set_irq_wake(irq2, 1); |
| 690 | return 0; | 690 | return 0; |
| 691 | } | 691 | } |
| 692 | 692 | ||
diff --git a/drivers/gpio/gpio-spear-spics.c b/drivers/gpio/gpio-spear-spics.c index 353263c85d26..506a2ea0eb4c 100644 --- a/drivers/gpio/gpio-spear-spics.c +++ b/drivers/gpio/gpio-spear-spics.c | |||
| @@ -204,5 +204,5 @@ static int __init spics_gpio_init(void) | |||
| 204 | subsys_initcall(spics_gpio_init); | 204 | subsys_initcall(spics_gpio_init); |
| 205 | 205 | ||
| 206 | MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@gmail.com>"); | 206 | MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@gmail.com>"); |
| 207 | MODULE_DESCRIPTION("ST Microlectronics SPEAr SPI Chip Select Abstraction"); | 207 | MODULE_DESCRIPTION("STMicroelectronics SPEAr SPI Chip Select Abstraction"); |
| 208 | MODULE_LICENSE("GPL"); | 208 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c index 4a85bb644e24..b928c17bdeed 100644 --- a/drivers/gpu/drm/radeon/mkregtable.c +++ b/drivers/gpu/drm/radeon/mkregtable.c | |||
| @@ -347,7 +347,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 347 | * list_entry - get the struct for this entry | 347 | * list_entry - get the struct for this entry |
| 348 | * @ptr: the &struct list_head pointer. | 348 | * @ptr: the &struct list_head pointer. |
| 349 | * @type: the type of the struct this is embedded in. | 349 | * @type: the type of the struct this is embedded in. |
| 350 | * @member: the name of the list_struct within the struct. | 350 | * @member: the name of the list_head within the struct. |
| 351 | */ | 351 | */ |
| 352 | #define list_entry(ptr, type, member) \ | 352 | #define list_entry(ptr, type, member) \ |
| 353 | container_of(ptr, type, member) | 353 | container_of(ptr, type, member) |
| @@ -356,7 +356,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 356 | * list_first_entry - get the first element from a list | 356 | * list_first_entry - get the first element from a list |
| 357 | * @ptr: the list head to take the element from. | 357 | * @ptr: the list head to take the element from. |
| 358 | * @type: the type of the struct this is embedded in. | 358 | * @type: the type of the struct this is embedded in. |
| 359 | * @member: the name of the list_struct within the struct. | 359 | * @member: the name of the list_head within the struct. |
| 360 | * | 360 | * |
| 361 | * Note, that list is expected to be not empty. | 361 | * Note, that list is expected to be not empty. |
| 362 | */ | 362 | */ |
| @@ -406,7 +406,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 406 | * list_for_each_entry - iterate over list of given type | 406 | * list_for_each_entry - iterate over list of given type |
| 407 | * @pos: the type * to use as a loop cursor. | 407 | * @pos: the type * to use as a loop cursor. |
| 408 | * @head: the head for your list. | 408 | * @head: the head for your list. |
| 409 | * @member: the name of the list_struct within the struct. | 409 | * @member: the name of the list_head within the struct. |
| 410 | */ | 410 | */ |
| 411 | #define list_for_each_entry(pos, head, member) \ | 411 | #define list_for_each_entry(pos, head, member) \ |
| 412 | for (pos = list_entry((head)->next, typeof(*pos), member); \ | 412 | for (pos = list_entry((head)->next, typeof(*pos), member); \ |
| @@ -417,7 +417,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 417 | * list_for_each_entry_reverse - iterate backwards over list of given type. | 417 | * list_for_each_entry_reverse - iterate backwards over list of given type. |
| 418 | * @pos: the type * to use as a loop cursor. | 418 | * @pos: the type * to use as a loop cursor. |
| 419 | * @head: the head for your list. | 419 | * @head: the head for your list. |
| 420 | * @member: the name of the list_struct within the struct. | 420 | * @member: the name of the list_head within the struct. |
| 421 | */ | 421 | */ |
| 422 | #define list_for_each_entry_reverse(pos, head, member) \ | 422 | #define list_for_each_entry_reverse(pos, head, member) \ |
| 423 | for (pos = list_entry((head)->prev, typeof(*pos), member); \ | 423 | for (pos = list_entry((head)->prev, typeof(*pos), member); \ |
| @@ -428,7 +428,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 428 | * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() | 428 | * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() |
| 429 | * @pos: the type * to use as a start point | 429 | * @pos: the type * to use as a start point |
| 430 | * @head: the head of the list | 430 | * @head: the head of the list |
| 431 | * @member: the name of the list_struct within the struct. | 431 | * @member: the name of the list_head within the struct. |
| 432 | * | 432 | * |
| 433 | * Prepares a pos entry for use as a start point in list_for_each_entry_continue(). | 433 | * Prepares a pos entry for use as a start point in list_for_each_entry_continue(). |
| 434 | */ | 434 | */ |
| @@ -439,7 +439,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 439 | * list_for_each_entry_continue - continue iteration over list of given type | 439 | * list_for_each_entry_continue - continue iteration over list of given type |
| 440 | * @pos: the type * to use as a loop cursor. | 440 | * @pos: the type * to use as a loop cursor. |
| 441 | * @head: the head for your list. | 441 | * @head: the head for your list. |
| 442 | * @member: the name of the list_struct within the struct. | 442 | * @member: the name of the list_head within the struct. |
| 443 | * | 443 | * |
| 444 | * Continue to iterate over list of given type, continuing after | 444 | * Continue to iterate over list of given type, continuing after |
| 445 | * the current position. | 445 | * the current position. |
| @@ -453,7 +453,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 453 | * list_for_each_entry_continue_reverse - iterate backwards from the given point | 453 | * list_for_each_entry_continue_reverse - iterate backwards from the given point |
| 454 | * @pos: the type * to use as a loop cursor. | 454 | * @pos: the type * to use as a loop cursor. |
| 455 | * @head: the head for your list. | 455 | * @head: the head for your list. |
| 456 | * @member: the name of the list_struct within the struct. | 456 | * @member: the name of the list_head within the struct. |
| 457 | * | 457 | * |
| 458 | * Start to iterate over list of given type backwards, continuing after | 458 | * Start to iterate over list of given type backwards, continuing after |
| 459 | * the current position. | 459 | * the current position. |
| @@ -467,7 +467,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 467 | * list_for_each_entry_from - iterate over list of given type from the current point | 467 | * list_for_each_entry_from - iterate over list of given type from the current point |
| 468 | * @pos: the type * to use as a loop cursor. | 468 | * @pos: the type * to use as a loop cursor. |
| 469 | * @head: the head for your list. | 469 | * @head: the head for your list. |
| 470 | * @member: the name of the list_struct within the struct. | 470 | * @member: the name of the list_head within the struct. |
| 471 | * | 471 | * |
| 472 | * Iterate over list of given type, continuing from current position. | 472 | * Iterate over list of given type, continuing from current position. |
| 473 | */ | 473 | */ |
| @@ -480,7 +480,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 480 | * @pos: the type * to use as a loop cursor. | 480 | * @pos: the type * to use as a loop cursor. |
| 481 | * @n: another type * to use as temporary storage | 481 | * @n: another type * to use as temporary storage |
| 482 | * @head: the head for your list. | 482 | * @head: the head for your list. |
| 483 | * @member: the name of the list_struct within the struct. | 483 | * @member: the name of the list_head within the struct. |
| 484 | */ | 484 | */ |
| 485 | #define list_for_each_entry_safe(pos, n, head, member) \ | 485 | #define list_for_each_entry_safe(pos, n, head, member) \ |
| 486 | for (pos = list_entry((head)->next, typeof(*pos), member), \ | 486 | for (pos = list_entry((head)->next, typeof(*pos), member), \ |
| @@ -493,7 +493,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 493 | * @pos: the type * to use as a loop cursor. | 493 | * @pos: the type * to use as a loop cursor. |
| 494 | * @n: another type * to use as temporary storage | 494 | * @n: another type * to use as temporary storage |
| 495 | * @head: the head for your list. | 495 | * @head: the head for your list. |
| 496 | * @member: the name of the list_struct within the struct. | 496 | * @member: the name of the list_head within the struct. |
| 497 | * | 497 | * |
| 498 | * Iterate over list of given type, continuing after current point, | 498 | * Iterate over list of given type, continuing after current point, |
| 499 | * safe against removal of list entry. | 499 | * safe against removal of list entry. |
| @@ -509,7 +509,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 509 | * @pos: the type * to use as a loop cursor. | 509 | * @pos: the type * to use as a loop cursor. |
| 510 | * @n: another type * to use as temporary storage | 510 | * @n: another type * to use as temporary storage |
| 511 | * @head: the head for your list. | 511 | * @head: the head for your list. |
| 512 | * @member: the name of the list_struct within the struct. | 512 | * @member: the name of the list_head within the struct. |
| 513 | * | 513 | * |
| 514 | * Iterate over list of given type from current point, safe against | 514 | * Iterate over list of given type from current point, safe against |
| 515 | * removal of list entry. | 515 | * removal of list entry. |
| @@ -524,7 +524,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 524 | * @pos: the type * to use as a loop cursor. | 524 | * @pos: the type * to use as a loop cursor. |
| 525 | * @n: another type * to use as temporary storage | 525 | * @n: another type * to use as temporary storage |
| 526 | * @head: the head for your list. | 526 | * @head: the head for your list. |
| 527 | * @member: the name of the list_struct within the struct. | 527 | * @member: the name of the list_head within the struct. |
| 528 | * | 528 | * |
| 529 | * Iterate backwards over list of given type, safe against removal | 529 | * Iterate backwards over list of given type, safe against removal |
| 530 | * of list entry. | 530 | * of list entry. |
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 9f454d76cc06..67c21876c35f 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
| @@ -1334,7 +1334,7 @@ init_card(struct l1oip *hc, int pri, int bundle) | |||
| 1334 | if (id[l1oip_cnt] == 0) { | 1334 | if (id[l1oip_cnt] == 0) { |
| 1335 | printk(KERN_WARNING "Warning: No 'id' value given or " | 1335 | printk(KERN_WARNING "Warning: No 'id' value given or " |
| 1336 | "0, this is highly unsecure. Please use 32 " | 1336 | "0, this is highly unsecure. Please use 32 " |
| 1337 | "bit randmom number 0x...\n"); | 1337 | "bit random number 0x...\n"); |
| 1338 | } | 1338 | } |
| 1339 | hc->id = id[l1oip_cnt]; | 1339 | hc->id = id[l1oip_cnt]; |
| 1340 | if (debug & DEBUG_L1OIP_INIT) | 1340 | if (debug & DEBUG_L1OIP_INIT) |
diff --git a/drivers/media/pci/cx18/cx18-driver.h b/drivers/media/pci/cx18/cx18-driver.h index dcfd7a1d317e..207d6e82403b 100644 --- a/drivers/media/pci/cx18/cx18-driver.h +++ b/drivers/media/pci/cx18/cx18-driver.h | |||
| @@ -290,7 +290,7 @@ struct cx18_options { | |||
| 290 | * list_entry_is_past_end - check if a previous loop cursor is off list end | 290 | * list_entry_is_past_end - check if a previous loop cursor is off list end |
| 291 | * @pos: the type * previously used as a loop cursor. | 291 | * @pos: the type * previously used as a loop cursor. |
| 292 | * @head: the head for your list. | 292 | * @head: the head for your list. |
| 293 | * @member: the name of the list_struct within the struct. | 293 | * @member: the name of the list_head within the struct. |
| 294 | * | 294 | * |
| 295 | * Check if the entry's list_head is the head of the list, thus it's not a | 295 | * Check if the entry's list_head is the head of the list, thus it's not a |
| 296 | * real entry but was the loop cursor that walked past the end | 296 | * real entry but was the loop cursor that walked past the end |
diff --git a/drivers/media/pci/ttpci/budget-patch.c b/drivers/media/pci/ttpci/budget-patch.c index 2cb35c23d2ac..a4d8867e1d7b 100644 --- a/drivers/media/pci/ttpci/budget-patch.c +++ b/drivers/media/pci/ttpci/budget-patch.c | |||
| @@ -490,7 +490,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
| 490 | 490 | ||
| 491 | if(detected == 0) | 491 | if(detected == 0) |
| 492 | printk("budget-patch not detected or saa7146 in non-default state.\n" | 492 | printk("budget-patch not detected or saa7146 in non-default state.\n" |
| 493 | "try enabling ressetting of 7146 with MASK_31 in MC1 register\n"); | 493 | "try enabling resetting of 7146 with MASK_31 in MC1 register\n"); |
| 494 | 494 | ||
| 495 | else | 495 | else |
| 496 | printk("BUDGET-PATCH DETECTED.\n"); | 496 | printk("BUDGET-PATCH DETECTED.\n"); |
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 72fb86b9aa24..c9946c6c119e 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
| @@ -48,7 +48,7 @@ MODULE_DEVICE_TABLE(pci, atl1c_pci_tbl); | |||
| 48 | 48 | ||
| 49 | MODULE_AUTHOR("Jie Yang"); | 49 | MODULE_AUTHOR("Jie Yang"); |
| 50 | MODULE_AUTHOR("Qualcomm Atheros Inc., <nic-devel@qualcomm.com>"); | 50 | MODULE_AUTHOR("Qualcomm Atheros Inc., <nic-devel@qualcomm.com>"); |
| 51 | MODULE_DESCRIPTION("Qualcom Atheros 100/1000M Ethernet Network Driver"); | 51 | MODULE_DESCRIPTION("Qualcomm Atheros 100/1000M Ethernet Network Driver"); |
| 52 | MODULE_LICENSE("GPL"); | 52 | MODULE_LICENSE("GPL"); |
| 53 | MODULE_VERSION(ATL1C_DRV_VERSION); | 53 | MODULE_VERSION(ATL1C_DRV_VERSION); |
| 54 | 54 | ||
diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c index bddb79105d67..ce5f22c4151d 100644 --- a/drivers/pinctrl/spear/pinctrl-plgpio.c +++ b/drivers/pinctrl/spear/pinctrl-plgpio.c | |||
| @@ -724,5 +724,5 @@ static int __init plgpio_init(void) | |||
| 724 | subsys_initcall(plgpio_init); | 724 | subsys_initcall(plgpio_init); |
| 725 | 725 | ||
| 726 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>"); | 726 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>"); |
| 727 | MODULE_DESCRIPTION("ST Microlectronics SPEAr PLGPIO driver"); | 727 | MODULE_DESCRIPTION("STMicroelectronics SPEAr PLGPIO driver"); |
| 728 | MODULE_LICENSE("GPL"); | 728 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index c0242ed13d9e..ecd36e332c3c 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c | |||
| @@ -593,7 +593,7 @@ static void ips_disable_gpu_turbo(struct ips_driver *ips) | |||
| 593 | return; | 593 | return; |
| 594 | 594 | ||
| 595 | if (!ips->gpu_turbo_disable()) | 595 | if (!ips->gpu_turbo_disable()) |
| 596 | dev_err(&ips->dev->dev, "failed to disable graphis turbo\n"); | 596 | dev_err(&ips->dev->dev, "failed to disable graphics turbo\n"); |
| 597 | else | 597 | else |
| 598 | ips->__gpu_turbo_on = false; | 598 | ips->__gpu_turbo_on = false; |
| 599 | } | 599 | } |
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c index 327cb19ad0b0..d3d1936057b4 100644 --- a/drivers/s390/char/tape_3590.c +++ b/drivers/s390/char/tape_3590.c | |||
| @@ -1090,7 +1090,7 @@ tape_3590_print_io_sim_msg_f1(struct tape_device *device, struct irb *irb) | |||
| 1090 | "channel path 0x%x on CU", | 1090 | "channel path 0x%x on CU", |
| 1091 | sense->fmt.f71.md[1]); | 1091 | sense->fmt.f71.md[1]); |
| 1092 | else | 1092 | else |
| 1093 | snprintf(service, BUFSIZE, "Repair will disable cannel" | 1093 | snprintf(service, BUFSIZE, "Repair will disable channel" |
| 1094 | " paths (0x%x-0x%x) on CU", | 1094 | " paths (0x%x-0x%x) on CU", |
| 1095 | sense->fmt.f71.md[1], sense->fmt.f71.md[2]); | 1095 | sense->fmt.f71.md[1], sense->fmt.f71.md[2]); |
| 1096 | break; | 1096 | break; |
| @@ -1481,7 +1481,7 @@ tape_3590_irq(struct tape_device *device, struct tape_request *request, | |||
| 1481 | } | 1481 | } |
| 1482 | 1482 | ||
| 1483 | if (irb->scsw.cmd.dstat & DEV_STAT_CHN_END) { | 1483 | if (irb->scsw.cmd.dstat & DEV_STAT_CHN_END) { |
| 1484 | DBF_EVENT(2, "cannel end\n"); | 1484 | DBF_EVENT(2, "channel end\n"); |
| 1485 | return TAPE_IO_PENDING; | 1485 | return TAPE_IO_PENDING; |
| 1486 | } | 1486 | } |
| 1487 | 1487 | ||
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c index 3f63c6318b0d..6dcaed0c1fc8 100644 --- a/drivers/scsi/isci/task.c +++ b/drivers/scsi/isci/task.c | |||
| @@ -588,7 +588,7 @@ int isci_task_abort_task(struct sas_task *task) | |||
| 588 | 588 | ||
| 589 | ret = TMF_RESP_FUNC_COMPLETE; | 589 | ret = TMF_RESP_FUNC_COMPLETE; |
| 590 | } else { | 590 | } else { |
| 591 | /* Fill in the tmf stucture */ | 591 | /* Fill in the tmf structure */ |
| 592 | isci_task_build_abort_task_tmf(&tmf, isci_tmf_ssp_task_abort, | 592 | isci_task_build_abort_task_tmf(&tmf, isci_tmf_ssp_task_abort, |
| 593 | old_request); | 593 | old_request); |
| 594 | 594 | ||
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index 953fd9b953c7..1e85c07e3b62 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c | |||
| @@ -166,7 +166,7 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance) | |||
| 166 | XXX: Since bus errors in the PDMA routines never happen on my | 166 | XXX: Since bus errors in the PDMA routines never happen on my |
| 167 | computer, the bus error code is untested. | 167 | computer, the bus error code is untested. |
| 168 | If the code works as intended, a bus error results in Pseudo-DMA | 168 | If the code works as intended, a bus error results in Pseudo-DMA |
| 169 | beeing disabled, meaning that the driver switches to slow handshake. | 169 | being disabled, meaning that the driver switches to slow handshake. |
| 170 | If bus errors are NOT extremely rare, this has to be changed. | 170 | If bus errors are NOT extremely rare, this has to be changed. |
| 171 | */ | 171 | */ |
| 172 | 172 | ||
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index f05580e693d0..ff283d23788a 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c | |||
| @@ -6783,7 +6783,7 @@ static int __init megasas_init(void) | |||
| 6783 | rval = pci_register_driver(&megasas_pci_driver); | 6783 | rval = pci_register_driver(&megasas_pci_driver); |
| 6784 | 6784 | ||
| 6785 | if (rval) { | 6785 | if (rval) { |
| 6786 | printk(KERN_DEBUG "megasas: PCI hotplug regisration failed \n"); | 6786 | printk(KERN_DEBUG "megasas: PCI hotplug registration failed \n"); |
| 6787 | goto err_pcidrv; | 6787 | goto err_pcidrv; |
| 6788 | } | 6788 | } |
| 6789 | 6789 | ||
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.h b/drivers/scsi/mpt2sas/mpt2sas_ctl.h index fa0567c96050..7f842c88abd2 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.h +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.h | |||
| @@ -224,7 +224,7 @@ struct mpt2_ioctl_eventreport { | |||
| 224 | }; | 224 | }; |
| 225 | 225 | ||
| 226 | /** | 226 | /** |
| 227 | * struct mpt2_ioctl_command - generic mpt firmware passthru ioclt | 227 | * struct mpt2_ioctl_command - generic mpt firmware passthru ioctl |
| 228 | * @hdr - generic header | 228 | * @hdr - generic header |
| 229 | * @timeout - command timeout in seconds. (if zero then use driver default | 229 | * @timeout - command timeout in seconds. (if zero then use driver default |
| 230 | * value). | 230 | * value). |
diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c index b3b48b5a984c..5298def33733 100644 --- a/drivers/scsi/ps3rom.c +++ b/drivers/scsi/ps3rom.c | |||
| @@ -383,6 +383,7 @@ static int ps3rom_probe(struct ps3_system_bus_device *_dev) | |||
| 383 | if (!host) { | 383 | if (!host) { |
| 384 | dev_err(&dev->sbd.core, "%s:%u: scsi_host_alloc failed\n", | 384 | dev_err(&dev->sbd.core, "%s:%u: scsi_host_alloc failed\n", |
| 385 | __func__, __LINE__); | 385 | __func__, __LINE__); |
| 386 | error = -ENOMEM; | ||
| 386 | goto fail_teardown; | 387 | goto fail_teardown; |
| 387 | } | 388 | } |
| 388 | 389 | ||
diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c index e9186cdf35e9..33ac39bf75e5 100644 --- a/drivers/target/target_core_xcopy.c +++ b/drivers/target/target_core_xcopy.c | |||
| @@ -335,7 +335,7 @@ static int target_xcopy_parse_segment_descriptors(struct se_cmd *se_cmd, | |||
| 335 | desc += XCOPY_SEGMENT_DESC_LEN; | 335 | desc += XCOPY_SEGMENT_DESC_LEN; |
| 336 | break; | 336 | break; |
| 337 | default: | 337 | default: |
| 338 | pr_err("XCOPY unspported segment descriptor" | 338 | pr_err("XCOPY unsupported segment descriptor" |
| 339 | "type: 0x%02x\n", desc[0]); | 339 | "type: 0x%02x\n", desc[0]); |
| 340 | goto out; | 340 | goto out; |
| 341 | } | 341 | } |
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 98f8bcaf3e7e..a26653fe788c 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig | |||
| @@ -701,7 +701,7 @@ config PDC_CONSOLE | |||
| 701 | Saying Y here will enable the software based PDC console to be | 701 | Saying Y here will enable the software based PDC console to be |
| 702 | used as the system console. This is useful for machines in | 702 | used as the system console. This is useful for machines in |
| 703 | which the hardware based console has not been written yet. The | 703 | which the hardware based console has not been written yet. The |
| 704 | following steps must be competed to use the PDC console: | 704 | following steps must be completed to use the PDC console: |
| 705 | 705 | ||
| 706 | 1. create the device entry (mknod /dev/ttyB0 c 11 0) | 706 | 1. create the device entry (mknod /dev/ttyB0 c 11 0) |
| 707 | 2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0 | 707 | 2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0 |
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c index 59ab62c92b66..ea2b9c374305 100644 --- a/drivers/usb/gadget/function/f_hid.c +++ b/drivers/usb/gadget/function/f_hid.c | |||
| @@ -396,7 +396,7 @@ static int hidg_setup(struct usb_function *f, | |||
| 396 | 396 | ||
| 397 | case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8 | 397 | case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8 |
| 398 | | HID_REQ_SET_REPORT): | 398 | | HID_REQ_SET_REPORT): |
| 399 | VDBG(cdev, "set_report | wLenght=%d\n", ctrl->wLength); | 399 | VDBG(cdev, "set_report | wLength=%d\n", ctrl->wLength); |
| 400 | goto stall; | 400 | goto stall; |
| 401 | break; | 401 | break; |
| 402 | 402 | ||
diff --git a/drivers/usb/gadget/legacy/zero.c b/drivers/usb/gadget/legacy/zero.c index ebf09f439f3a..ff97ac93ac03 100644 --- a/drivers/usb/gadget/legacy/zero.c +++ b/drivers/usb/gadget/legacy/zero.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | * | 28 | * |
| 29 | * Why is *this* driver using two configurations, rather than setting up | 29 | * Why is *this* driver using two configurations, rather than setting up |
| 30 | * two interfaces with different functions? To help verify that multiple | 30 | * two interfaces with different functions? To help verify that multiple |
| 31 | * configuration infrastucture is working correctly; also, so that it can | 31 | * configuration infrastructure is working correctly; also, so that it can |
| 32 | * work with low capability USB controllers without four bulk endpoints. | 32 | * work with low capability USB controllers without four bulk endpoints. |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
diff --git a/drivers/usb/host/ehci-sysfs.c b/drivers/usb/host/ehci-sysfs.c index f6459dfb6f54..5e44407aa099 100644 --- a/drivers/usb/host/ehci-sysfs.c +++ b/drivers/usb/host/ehci-sysfs.c | |||
| @@ -132,7 +132,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev, | |||
| 132 | 132 | ||
| 133 | if (allocated_max > uframe_periodic_max) { | 133 | if (allocated_max > uframe_periodic_max) { |
| 134 | ehci_info(ehci, | 134 | ehci_info(ehci, |
| 135 | "cannot decrease uframe_periodic_max becase " | 135 | "cannot decrease uframe_periodic_max because " |
| 136 | "periodic bandwidth is already allocated " | 136 | "periodic bandwidth is already allocated " |
| 137 | "(%u > %u)\n", | 137 | "(%u > %u)\n", |
| 138 | allocated_max, uframe_periodic_max); | 138 | allocated_max, uframe_periodic_max); |
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c index 3de1278677d0..ecf02b2623e8 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c | |||
| @@ -4958,7 +4958,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev, | |||
| 4958 | 4958 | ||
| 4959 | if (allocated_max > uframe_periodic_max) { | 4959 | if (allocated_max > uframe_periodic_max) { |
| 4960 | fotg210_info(fotg210, | 4960 | fotg210_info(fotg210, |
| 4961 | "cannot decrease uframe_periodic_max becase " | 4961 | "cannot decrease uframe_periodic_max because " |
| 4962 | "periodic bandwidth is already allocated " | 4962 | "periodic bandwidth is already allocated " |
| 4963 | "(%u > %u)\n", | 4963 | "(%u > %u)\n", |
| 4964 | allocated_max, uframe_periodic_max); | 4964 | allocated_max, uframe_periodic_max); |
diff --git a/drivers/usb/host/fusbh200-hcd.c b/drivers/usb/host/fusbh200-hcd.c index abe42f31559f..664d2aa1239c 100644 --- a/drivers/usb/host/fusbh200-hcd.c +++ b/drivers/usb/host/fusbh200-hcd.c | |||
| @@ -4893,7 +4893,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev, | |||
| 4893 | 4893 | ||
| 4894 | if (allocated_max > uframe_periodic_max) { | 4894 | if (allocated_max > uframe_periodic_max) { |
| 4895 | fusbh200_info(fusbh200, | 4895 | fusbh200_info(fusbh200, |
| 4896 | "cannot decrease uframe_periodic_max becase " | 4896 | "cannot decrease uframe_periodic_max because " |
| 4897 | "periodic bandwidth is already allocated " | 4897 | "periodic bandwidth is already allocated " |
| 4898 | "(%u > %u)\n", | 4898 | "(%u > %u)\n", |
| 4899 | allocated_max, uframe_periodic_max); | 4899 | allocated_max, uframe_periodic_max); |
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c index 7064eb8d6142..8bfc47c29828 100644 --- a/drivers/usb/serial/usb-serial-simple.c +++ b/drivers/usb/serial/usb-serial-simple.c | |||
| @@ -64,7 +64,7 @@ DEVICE(vivopay, VIVOPAY_IDS); | |||
| 64 | /* Motorola USB Phone driver */ | 64 | /* Motorola USB Phone driver */ |
| 65 | #define MOTO_IDS() \ | 65 | #define MOTO_IDS() \ |
| 66 | { USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */ \ | 66 | { USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */ \ |
| 67 | { USB_DEVICE(0x0c44, 0x0022) }, /* unknown Mororola phone */ \ | 67 | { USB_DEVICE(0x0c44, 0x0022) }, /* unknown Motorola phone */ \ |
| 68 | { USB_DEVICE(0x22b8, 0x2a64) }, /* Motorola KRZR K1m */ \ | 68 | { USB_DEVICE(0x22b8, 0x2a64) }, /* Motorola KRZR K1m */ \ |
| 69 | { USB_DEVICE(0x22b8, 0x2c84) }, /* Motorola VE240 phone */ \ | 69 | { USB_DEVICE(0x22b8, 0x2c84) }, /* Motorola VE240 phone */ \ |
| 70 | { USB_DEVICE(0x22b8, 0x2c64) } /* Motorola V950 phone */ | 70 | { USB_DEVICE(0x22b8, 0x2c64) } /* Motorola V950 phone */ |
diff --git a/drivers/video/fbdev/exynos/exynos_mipi_dsi.c b/drivers/video/fbdev/exynos/exynos_mipi_dsi.c index cee9602f9a7b..716bfad6a1c0 100644 --- a/drivers/video/fbdev/exynos/exynos_mipi_dsi.c +++ b/drivers/video/fbdev/exynos/exynos_mipi_dsi.c | |||
| @@ -570,5 +570,5 @@ static struct platform_driver exynos_mipi_dsi_driver = { | |||
| 570 | module_platform_driver(exynos_mipi_dsi_driver); | 570 | module_platform_driver(exynos_mipi_dsi_driver); |
| 571 | 571 | ||
| 572 | MODULE_AUTHOR("InKi Dae <inki.dae@samsung.com>"); | 572 | MODULE_AUTHOR("InKi Dae <inki.dae@samsung.com>"); |
| 573 | MODULE_DESCRIPTION("Samusung SoC MIPI-DSI driver"); | 573 | MODULE_DESCRIPTION("Samsung SoC MIPI-DSI driver"); |
| 574 | MODULE_LICENSE("GPL"); | 574 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c b/drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c index 85edabfdef5a..2358a2fbbbcd 100644 --- a/drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c +++ b/drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c | |||
| @@ -876,5 +876,5 @@ int exynos_mipi_dsi_fifo_clear(struct mipi_dsim_device *dsim, | |||
| 876 | } | 876 | } |
| 877 | 877 | ||
| 878 | MODULE_AUTHOR("InKi Dae <inki.dae@samsung.com>"); | 878 | MODULE_AUTHOR("InKi Dae <inki.dae@samsung.com>"); |
| 879 | MODULE_DESCRIPTION("Samusung SoC MIPI-DSI common driver"); | 879 | MODULE_DESCRIPTION("Samsung SoC MIPI-DSI common driver"); |
| 880 | MODULE_LICENSE("GPL"); | 880 | MODULE_LICENSE("GPL"); |
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index d571e173a990..9d6486d416a3 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
| @@ -2772,7 +2772,7 @@ int journal_init(struct super_block *sb, const char *j_dev_name, | |||
| 2772 | 2772 | ||
| 2773 | if (journal_init_dev(sb, journal, j_dev_name) != 0) { | 2773 | if (journal_init_dev(sb, journal, j_dev_name) != 0) { |
| 2774 | reiserfs_warning(sb, "sh-462", | 2774 | reiserfs_warning(sb, "sh-462", |
| 2775 | "unable to initialize jornal device"); | 2775 | "unable to initialize journal device"); |
| 2776 | goto free_and_return; | 2776 | goto free_and_return; |
| 2777 | } | 2777 | } |
| 2778 | 2778 | ||
diff --git a/include/linux/list.h b/include/linux/list.h index f33f831eb3c8..feb773c76ee0 100644 --- a/include/linux/list.h +++ b/include/linux/list.h | |||
| @@ -346,7 +346,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 346 | * list_entry - get the struct for this entry | 346 | * list_entry - get the struct for this entry |
| 347 | * @ptr: the &struct list_head pointer. | 347 | * @ptr: the &struct list_head pointer. |
| 348 | * @type: the type of the struct this is embedded in. | 348 | * @type: the type of the struct this is embedded in. |
| 349 | * @member: the name of the list_struct within the struct. | 349 | * @member: the name of the list_head within the struct. |
| 350 | */ | 350 | */ |
| 351 | #define list_entry(ptr, type, member) \ | 351 | #define list_entry(ptr, type, member) \ |
| 352 | container_of(ptr, type, member) | 352 | container_of(ptr, type, member) |
| @@ -355,7 +355,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 355 | * list_first_entry - get the first element from a list | 355 | * list_first_entry - get the first element from a list |
| 356 | * @ptr: the list head to take the element from. | 356 | * @ptr: the list head to take the element from. |
| 357 | * @type: the type of the struct this is embedded in. | 357 | * @type: the type of the struct this is embedded in. |
| 358 | * @member: the name of the list_struct within the struct. | 358 | * @member: the name of the list_head within the struct. |
| 359 | * | 359 | * |
| 360 | * Note, that list is expected to be not empty. | 360 | * Note, that list is expected to be not empty. |
| 361 | */ | 361 | */ |
| @@ -366,7 +366,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 366 | * list_last_entry - get the last element from a list | 366 | * list_last_entry - get the last element from a list |
| 367 | * @ptr: the list head to take the element from. | 367 | * @ptr: the list head to take the element from. |
| 368 | * @type: the type of the struct this is embedded in. | 368 | * @type: the type of the struct this is embedded in. |
| 369 | * @member: the name of the list_struct within the struct. | 369 | * @member: the name of the list_head within the struct. |
| 370 | * | 370 | * |
| 371 | * Note, that list is expected to be not empty. | 371 | * Note, that list is expected to be not empty. |
| 372 | */ | 372 | */ |
| @@ -377,7 +377,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 377 | * list_first_entry_or_null - get the first element from a list | 377 | * list_first_entry_or_null - get the first element from a list |
| 378 | * @ptr: the list head to take the element from. | 378 | * @ptr: the list head to take the element from. |
| 379 | * @type: the type of the struct this is embedded in. | 379 | * @type: the type of the struct this is embedded in. |
| 380 | * @member: the name of the list_struct within the struct. | 380 | * @member: the name of the list_head within the struct. |
| 381 | * | 381 | * |
| 382 | * Note that if the list is empty, it returns NULL. | 382 | * Note that if the list is empty, it returns NULL. |
| 383 | */ | 383 | */ |
| @@ -387,7 +387,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 387 | /** | 387 | /** |
| 388 | * list_next_entry - get the next element in list | 388 | * list_next_entry - get the next element in list |
| 389 | * @pos: the type * to cursor | 389 | * @pos: the type * to cursor |
| 390 | * @member: the name of the list_struct within the struct. | 390 | * @member: the name of the list_head within the struct. |
| 391 | */ | 391 | */ |
| 392 | #define list_next_entry(pos, member) \ | 392 | #define list_next_entry(pos, member) \ |
| 393 | list_entry((pos)->member.next, typeof(*(pos)), member) | 393 | list_entry((pos)->member.next, typeof(*(pos)), member) |
| @@ -395,7 +395,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 395 | /** | 395 | /** |
| 396 | * list_prev_entry - get the prev element in list | 396 | * list_prev_entry - get the prev element in list |
| 397 | * @pos: the type * to cursor | 397 | * @pos: the type * to cursor |
| 398 | * @member: the name of the list_struct within the struct. | 398 | * @member: the name of the list_head within the struct. |
| 399 | */ | 399 | */ |
| 400 | #define list_prev_entry(pos, member) \ | 400 | #define list_prev_entry(pos, member) \ |
| 401 | list_entry((pos)->member.prev, typeof(*(pos)), member) | 401 | list_entry((pos)->member.prev, typeof(*(pos)), member) |
| @@ -441,7 +441,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 441 | * list_for_each_entry - iterate over list of given type | 441 | * list_for_each_entry - iterate over list of given type |
| 442 | * @pos: the type * to use as a loop cursor. | 442 | * @pos: the type * to use as a loop cursor. |
| 443 | * @head: the head for your list. | 443 | * @head: the head for your list. |
| 444 | * @member: the name of the list_struct within the struct. | 444 | * @member: the name of the list_head within the struct. |
| 445 | */ | 445 | */ |
| 446 | #define list_for_each_entry(pos, head, member) \ | 446 | #define list_for_each_entry(pos, head, member) \ |
| 447 | for (pos = list_first_entry(head, typeof(*pos), member); \ | 447 | for (pos = list_first_entry(head, typeof(*pos), member); \ |
| @@ -452,7 +452,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 452 | * list_for_each_entry_reverse - iterate backwards over list of given type. | 452 | * list_for_each_entry_reverse - iterate backwards over list of given type. |
| 453 | * @pos: the type * to use as a loop cursor. | 453 | * @pos: the type * to use as a loop cursor. |
| 454 | * @head: the head for your list. | 454 | * @head: the head for your list. |
| 455 | * @member: the name of the list_struct within the struct. | 455 | * @member: the name of the list_head within the struct. |
| 456 | */ | 456 | */ |
| 457 | #define list_for_each_entry_reverse(pos, head, member) \ | 457 | #define list_for_each_entry_reverse(pos, head, member) \ |
| 458 | for (pos = list_last_entry(head, typeof(*pos), member); \ | 458 | for (pos = list_last_entry(head, typeof(*pos), member); \ |
| @@ -463,7 +463,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 463 | * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() | 463 | * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() |
| 464 | * @pos: the type * to use as a start point | 464 | * @pos: the type * to use as a start point |
| 465 | * @head: the head of the list | 465 | * @head: the head of the list |
| 466 | * @member: the name of the list_struct within the struct. | 466 | * @member: the name of the list_head within the struct. |
| 467 | * | 467 | * |
| 468 | * Prepares a pos entry for use as a start point in list_for_each_entry_continue(). | 468 | * Prepares a pos entry for use as a start point in list_for_each_entry_continue(). |
| 469 | */ | 469 | */ |
| @@ -474,7 +474,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 474 | * list_for_each_entry_continue - continue iteration over list of given type | 474 | * list_for_each_entry_continue - continue iteration over list of given type |
| 475 | * @pos: the type * to use as a loop cursor. | 475 | * @pos: the type * to use as a loop cursor. |
| 476 | * @head: the head for your list. | 476 | * @head: the head for your list. |
| 477 | * @member: the name of the list_struct within the struct. | 477 | * @member: the name of the list_head within the struct. |
| 478 | * | 478 | * |
| 479 | * Continue to iterate over list of given type, continuing after | 479 | * Continue to iterate over list of given type, continuing after |
| 480 | * the current position. | 480 | * the current position. |
| @@ -488,7 +488,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 488 | * list_for_each_entry_continue_reverse - iterate backwards from the given point | 488 | * list_for_each_entry_continue_reverse - iterate backwards from the given point |
| 489 | * @pos: the type * to use as a loop cursor. | 489 | * @pos: the type * to use as a loop cursor. |
| 490 | * @head: the head for your list. | 490 | * @head: the head for your list. |
| 491 | * @member: the name of the list_struct within the struct. | 491 | * @member: the name of the list_head within the struct. |
| 492 | * | 492 | * |
| 493 | * Start to iterate over list of given type backwards, continuing after | 493 | * Start to iterate over list of given type backwards, continuing after |
| 494 | * the current position. | 494 | * the current position. |
| @@ -502,7 +502,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 502 | * list_for_each_entry_from - iterate over list of given type from the current point | 502 | * list_for_each_entry_from - iterate over list of given type from the current point |
| 503 | * @pos: the type * to use as a loop cursor. | 503 | * @pos: the type * to use as a loop cursor. |
| 504 | * @head: the head for your list. | 504 | * @head: the head for your list. |
| 505 | * @member: the name of the list_struct within the struct. | 505 | * @member: the name of the list_head within the struct. |
| 506 | * | 506 | * |
| 507 | * Iterate over list of given type, continuing from current position. | 507 | * Iterate over list of given type, continuing from current position. |
| 508 | */ | 508 | */ |
| @@ -515,7 +515,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 515 | * @pos: the type * to use as a loop cursor. | 515 | * @pos: the type * to use as a loop cursor. |
| 516 | * @n: another type * to use as temporary storage | 516 | * @n: another type * to use as temporary storage |
| 517 | * @head: the head for your list. | 517 | * @head: the head for your list. |
| 518 | * @member: the name of the list_struct within the struct. | 518 | * @member: the name of the list_head within the struct. |
| 519 | */ | 519 | */ |
| 520 | #define list_for_each_entry_safe(pos, n, head, member) \ | 520 | #define list_for_each_entry_safe(pos, n, head, member) \ |
| 521 | for (pos = list_first_entry(head, typeof(*pos), member), \ | 521 | for (pos = list_first_entry(head, typeof(*pos), member), \ |
| @@ -528,7 +528,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 528 | * @pos: the type * to use as a loop cursor. | 528 | * @pos: the type * to use as a loop cursor. |
| 529 | * @n: another type * to use as temporary storage | 529 | * @n: another type * to use as temporary storage |
| 530 | * @head: the head for your list. | 530 | * @head: the head for your list. |
| 531 | * @member: the name of the list_struct within the struct. | 531 | * @member: the name of the list_head within the struct. |
| 532 | * | 532 | * |
| 533 | * Iterate over list of given type, continuing after current point, | 533 | * Iterate over list of given type, continuing after current point, |
| 534 | * safe against removal of list entry. | 534 | * safe against removal of list entry. |
| @@ -544,7 +544,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 544 | * @pos: the type * to use as a loop cursor. | 544 | * @pos: the type * to use as a loop cursor. |
| 545 | * @n: another type * to use as temporary storage | 545 | * @n: another type * to use as temporary storage |
| 546 | * @head: the head for your list. | 546 | * @head: the head for your list. |
| 547 | * @member: the name of the list_struct within the struct. | 547 | * @member: the name of the list_head within the struct. |
| 548 | * | 548 | * |
| 549 | * Iterate over list of given type from current point, safe against | 549 | * Iterate over list of given type from current point, safe against |
| 550 | * removal of list entry. | 550 | * removal of list entry. |
| @@ -559,7 +559,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 559 | * @pos: the type * to use as a loop cursor. | 559 | * @pos: the type * to use as a loop cursor. |
| 560 | * @n: another type * to use as temporary storage | 560 | * @n: another type * to use as temporary storage |
| 561 | * @head: the head for your list. | 561 | * @head: the head for your list. |
| 562 | * @member: the name of the list_struct within the struct. | 562 | * @member: the name of the list_head within the struct. |
| 563 | * | 563 | * |
| 564 | * Iterate backwards over list of given type, safe against removal | 564 | * Iterate backwards over list of given type, safe against removal |
| 565 | * of list entry. | 565 | * of list entry. |
| @@ -574,7 +574,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 574 | * list_safe_reset_next - reset a stale list_for_each_entry_safe loop | 574 | * list_safe_reset_next - reset a stale list_for_each_entry_safe loop |
| 575 | * @pos: the loop cursor used in the list_for_each_entry_safe loop | 575 | * @pos: the loop cursor used in the list_for_each_entry_safe loop |
| 576 | * @n: temporary storage used in list_for_each_entry_safe | 576 | * @n: temporary storage used in list_for_each_entry_safe |
| 577 | * @member: the name of the list_struct within the struct. | 577 | * @member: the name of the list_head within the struct. |
| 578 | * | 578 | * |
| 579 | * list_safe_reset_next is not safe to use in general if the list may be | 579 | * list_safe_reset_next is not safe to use in general if the list may be |
| 580 | * modified concurrently (eg. the lock is dropped in the loop body). An | 580 | * modified concurrently (eg. the lock is dropped in the loop body). An |
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 44eeef0da186..745def862580 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -69,7 +69,7 @@ struct ieee1394_device_id { | |||
| 69 | * @bDeviceClass: Class of device; numbers are assigned | 69 | * @bDeviceClass: Class of device; numbers are assigned |
| 70 | * by the USB forum. Products may choose to implement classes, | 70 | * by the USB forum. Products may choose to implement classes, |
| 71 | * or be vendor-specific. Device classes specify behavior of all | 71 | * or be vendor-specific. Device classes specify behavior of all |
| 72 | * the interfaces on a devices. | 72 | * the interfaces on a device. |
| 73 | * @bDeviceSubClass: Subclass of device; associated with bDeviceClass. | 73 | * @bDeviceSubClass: Subclass of device; associated with bDeviceClass. |
| 74 | * @bDeviceProtocol: Protocol of device; associated with bDeviceClass. | 74 | * @bDeviceProtocol: Protocol of device; associated with bDeviceClass. |
| 75 | * @bInterfaceClass: Class of interface; numbers are assigned | 75 | * @bInterfaceClass: Class of interface; numbers are assigned |
diff --git a/include/linux/plist.h b/include/linux/plist.h index 8b6c970cff6c..97883604a3c5 100644 --- a/include/linux/plist.h +++ b/include/linux/plist.h | |||
| @@ -176,7 +176,7 @@ extern void plist_requeue(struct plist_node *node, struct plist_head *head); | |||
| 176 | * plist_for_each_entry - iterate over list of given type | 176 | * plist_for_each_entry - iterate over list of given type |
| 177 | * @pos: the type * to use as a loop counter | 177 | * @pos: the type * to use as a loop counter |
| 178 | * @head: the head for your list | 178 | * @head: the head for your list |
| 179 | * @mem: the name of the list_struct within the struct | 179 | * @mem: the name of the list_head within the struct |
| 180 | */ | 180 | */ |
| 181 | #define plist_for_each_entry(pos, head, mem) \ | 181 | #define plist_for_each_entry(pos, head, mem) \ |
| 182 | list_for_each_entry(pos, &(head)->node_list, mem.node_list) | 182 | list_for_each_entry(pos, &(head)->node_list, mem.node_list) |
| @@ -185,7 +185,7 @@ extern void plist_requeue(struct plist_node *node, struct plist_head *head); | |||
| 185 | * plist_for_each_entry_continue - continue iteration over list of given type | 185 | * plist_for_each_entry_continue - continue iteration over list of given type |
| 186 | * @pos: the type * to use as a loop cursor | 186 | * @pos: the type * to use as a loop cursor |
| 187 | * @head: the head for your list | 187 | * @head: the head for your list |
| 188 | * @m: the name of the list_struct within the struct | 188 | * @m: the name of the list_head within the struct |
| 189 | * | 189 | * |
| 190 | * Continue to iterate over list of given type, continuing after | 190 | * Continue to iterate over list of given type, continuing after |
| 191 | * the current position. | 191 | * the current position. |
| @@ -198,7 +198,7 @@ extern void plist_requeue(struct plist_node *node, struct plist_head *head); | |||
| 198 | * @pos: the type * to use as a loop counter | 198 | * @pos: the type * to use as a loop counter |
| 199 | * @n: another type * to use as temporary storage | 199 | * @n: another type * to use as temporary storage |
| 200 | * @head: the head for your list | 200 | * @head: the head for your list |
| 201 | * @m: the name of the list_struct within the struct | 201 | * @m: the name of the list_head within the struct |
| 202 | * | 202 | * |
| 203 | * Iterate over list of given type, safe against removal of list entry. | 203 | * Iterate over list of given type, safe against removal of list entry. |
| 204 | */ | 204 | */ |
| @@ -229,7 +229,7 @@ static inline int plist_node_empty(const struct plist_node *node) | |||
| 229 | * plist_first_entry - get the struct for the first entry | 229 | * plist_first_entry - get the struct for the first entry |
| 230 | * @head: the &struct plist_head pointer | 230 | * @head: the &struct plist_head pointer |
| 231 | * @type: the type of the struct this is embedded in | 231 | * @type: the type of the struct this is embedded in |
| 232 | * @member: the name of the list_struct within the struct | 232 | * @member: the name of the list_head within the struct |
| 233 | */ | 233 | */ |
| 234 | #ifdef CONFIG_DEBUG_PI_LIST | 234 | #ifdef CONFIG_DEBUG_PI_LIST |
| 235 | # define plist_first_entry(head, type, member) \ | 235 | # define plist_first_entry(head, type, member) \ |
| @@ -246,7 +246,7 @@ static inline int plist_node_empty(const struct plist_node *node) | |||
| 246 | * plist_last_entry - get the struct for the last entry | 246 | * plist_last_entry - get the struct for the last entry |
| 247 | * @head: the &struct plist_head pointer | 247 | * @head: the &struct plist_head pointer |
| 248 | * @type: the type of the struct this is embedded in | 248 | * @type: the type of the struct this is embedded in |
| 249 | * @member: the name of the list_struct within the struct | 249 | * @member: the name of the list_head within the struct |
| 250 | */ | 250 | */ |
| 251 | #ifdef CONFIG_DEBUG_PI_LIST | 251 | #ifdef CONFIG_DEBUG_PI_LIST |
| 252 | # define plist_last_entry(head, type, member) \ | 252 | # define plist_last_entry(head, type, member) \ |
diff --git a/include/linux/rculist.h b/include/linux/rculist.h index aa79b3c24f66..529bc946f450 100644 --- a/include/linux/rculist.h +++ b/include/linux/rculist.h | |||
| @@ -241,7 +241,7 @@ static inline void list_splice_init_rcu(struct list_head *list, | |||
| 241 | * list_entry_rcu - get the struct for this entry | 241 | * list_entry_rcu - get the struct for this entry |
| 242 | * @ptr: the &struct list_head pointer. | 242 | * @ptr: the &struct list_head pointer. |
| 243 | * @type: the type of the struct this is embedded in. | 243 | * @type: the type of the struct this is embedded in. |
| 244 | * @member: the name of the list_struct within the struct. | 244 | * @member: the name of the list_head within the struct. |
| 245 | * | 245 | * |
| 246 | * This primitive may safely run concurrently with the _rcu list-mutation | 246 | * This primitive may safely run concurrently with the _rcu list-mutation |
| 247 | * primitives such as list_add_rcu() as long as it's guarded by rcu_read_lock(). | 247 | * primitives such as list_add_rcu() as long as it's guarded by rcu_read_lock(). |
| @@ -278,7 +278,7 @@ static inline void list_splice_init_rcu(struct list_head *list, | |||
| 278 | * list_first_or_null_rcu - get the first element from a list | 278 | * list_first_or_null_rcu - get the first element from a list |
| 279 | * @ptr: the list head to take the element from. | 279 | * @ptr: the list head to take the element from. |
| 280 | * @type: the type of the struct this is embedded in. | 280 | * @type: the type of the struct this is embedded in. |
| 281 | * @member: the name of the list_struct within the struct. | 281 | * @member: the name of the list_head within the struct. |
| 282 | * | 282 | * |
| 283 | * Note that if the list is empty, it returns NULL. | 283 | * Note that if the list is empty, it returns NULL. |
| 284 | * | 284 | * |
| @@ -296,7 +296,7 @@ static inline void list_splice_init_rcu(struct list_head *list, | |||
| 296 | * list_for_each_entry_rcu - iterate over rcu list of given type | 296 | * list_for_each_entry_rcu - iterate over rcu list of given type |
| 297 | * @pos: the type * to use as a loop cursor. | 297 | * @pos: the type * to use as a loop cursor. |
| 298 | * @head: the head for your list. | 298 | * @head: the head for your list. |
| 299 | * @member: the name of the list_struct within the struct. | 299 | * @member: the name of the list_head within the struct. |
| 300 | * | 300 | * |
| 301 | * This list-traversal primitive may safely run concurrently with | 301 | * This list-traversal primitive may safely run concurrently with |
| 302 | * the _rcu list-mutation primitives such as list_add_rcu() | 302 | * the _rcu list-mutation primitives such as list_add_rcu() |
| @@ -311,7 +311,7 @@ static inline void list_splice_init_rcu(struct list_head *list, | |||
| 311 | * list_for_each_entry_continue_rcu - continue iteration over list of given type | 311 | * list_for_each_entry_continue_rcu - continue iteration over list of given type |
| 312 | * @pos: the type * to use as a loop cursor. | 312 | * @pos: the type * to use as a loop cursor. |
| 313 | * @head: the head for your list. | 313 | * @head: the head for your list. |
| 314 | * @member: the name of the list_struct within the struct. | 314 | * @member: the name of the list_head within the struct. |
| 315 | * | 315 | * |
| 316 | * Continue to iterate over list of given type, continuing after | 316 | * Continue to iterate over list of given type, continuing after |
| 317 | * the current position. | 317 | * the current position. |
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index c8a462ef9a4e..e939d2b3757a 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
| @@ -554,7 +554,7 @@ struct Scsi_Host { | |||
| 554 | * __devices is protected by the host_lock, but you should | 554 | * __devices is protected by the host_lock, but you should |
| 555 | * usually use scsi_device_lookup / shost_for_each_device | 555 | * usually use scsi_device_lookup / shost_for_each_device |
| 556 | * to access it and don't care about locking yourself. | 556 | * to access it and don't care about locking yourself. |
| 557 | * In the rare case of beeing in irq context you can use | 557 | * In the rare case of being in irq context you can use |
| 558 | * their __ prefixed variants with the lock held. NEVER | 558 | * their __ prefixed variants with the lock held. NEVER |
| 559 | * access this list directly from a driver. | 559 | * access this list directly from a driver. |
| 560 | */ | 560 | */ |
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 2e949cc9c9f1..b79f39bda7e1 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
| @@ -792,7 +792,7 @@ int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq) | |||
| 792 | /* Initialize mult/shift and max_idle_ns */ | 792 | /* Initialize mult/shift and max_idle_ns */ |
| 793 | __clocksource_updatefreq_scale(cs, scale, freq); | 793 | __clocksource_updatefreq_scale(cs, scale, freq); |
| 794 | 794 | ||
| 795 | /* Add clocksource to the clcoksource list */ | 795 | /* Add clocksource to the clocksource list */ |
| 796 | mutex_lock(&clocksource_mutex); | 796 | mutex_lock(&clocksource_mutex); |
| 797 | clocksource_enqueue(cs); | 797 | clocksource_enqueue(cs); |
| 798 | clocksource_enqueue_watchdog(cs); | 798 | clocksource_enqueue_watchdog(cs); |
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 1af4f8f2ab5d..ab76b7bcb36a 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -2031,7 +2031,7 @@ void trace_printk_init_buffers(void) | |||
| 2031 | pr_warning("** trace_printk() being used. Allocating extra memory. **\n"); | 2031 | pr_warning("** trace_printk() being used. Allocating extra memory. **\n"); |
| 2032 | pr_warning("** **\n"); | 2032 | pr_warning("** **\n"); |
| 2033 | pr_warning("** This means that this is a DEBUG kernel and it is **\n"); | 2033 | pr_warning("** This means that this is a DEBUG kernel and it is **\n"); |
| 2034 | pr_warning("** unsafe for produciton use. **\n"); | 2034 | pr_warning("** unsafe for production use. **\n"); |
| 2035 | pr_warning("** **\n"); | 2035 | pr_warning("** **\n"); |
| 2036 | pr_warning("** If you see this message and you are not debugging **\n"); | 2036 | pr_warning("** If you see this message and you are not debugging **\n"); |
| 2037 | pr_warning("** the kernel, report this immediately to your vendor! **\n"); | 2037 | pr_warning("** the kernel, report this immediately to your vendor! **\n"); |
| @@ -619,5 +619,5 @@ module_init(init_zbud); | |||
| 619 | module_exit(exit_zbud); | 619 | module_exit(exit_zbud); |
| 620 | 620 | ||
| 621 | MODULE_LICENSE("GPL"); | 621 | MODULE_LICENSE("GPL"); |
| 622 | MODULE_AUTHOR("Seth Jennings <sjenning@linux.vnet.ibm.com>"); | 622 | MODULE_AUTHOR("Seth Jennings <sjennings@variantweb.net>"); |
| 623 | MODULE_DESCRIPTION("Buddy Allocator for Compressed Pages"); | 623 | MODULE_DESCRIPTION("Buddy Allocator for Compressed Pages"); |
diff --git a/mm/zswap.c b/mm/zswap.c index ea064c1a09ba..c1543061a192 100644 --- a/mm/zswap.c +++ b/mm/zswap.c | |||
| @@ -951,5 +951,5 @@ error: | |||
| 951 | late_initcall(init_zswap); | 951 | late_initcall(init_zswap); |
| 952 | 952 | ||
| 953 | MODULE_LICENSE("GPL"); | 953 | MODULE_LICENSE("GPL"); |
| 954 | MODULE_AUTHOR("Seth Jennings <sjenning@linux.vnet.ibm.com>"); | 954 | MODULE_AUTHOR("Seth Jennings <sjennings@variantweb.net>"); |
| 955 | MODULE_DESCRIPTION("Compressed cache for swap pages"); | 955 | MODULE_DESCRIPTION("Compressed cache for swap pages"); |
diff --git a/scripts/kconfig/list.h b/scripts/kconfig/list.h index 685d80e1bb0e..2cf23f002d3f 100644 --- a/scripts/kconfig/list.h +++ b/scripts/kconfig/list.h | |||
| @@ -34,7 +34,7 @@ struct list_head { | |||
| 34 | * list_entry - get the struct for this entry | 34 | * list_entry - get the struct for this entry |
| 35 | * @ptr: the &struct list_head pointer. | 35 | * @ptr: the &struct list_head pointer. |
| 36 | * @type: the type of the struct this is embedded in. | 36 | * @type: the type of the struct this is embedded in. |
| 37 | * @member: the name of the list_struct within the struct. | 37 | * @member: the name of the list_head within the struct. |
| 38 | */ | 38 | */ |
| 39 | #define list_entry(ptr, type, member) \ | 39 | #define list_entry(ptr, type, member) \ |
| 40 | container_of(ptr, type, member) | 40 | container_of(ptr, type, member) |
| @@ -43,7 +43,7 @@ struct list_head { | |||
| 43 | * list_for_each_entry - iterate over list of given type | 43 | * list_for_each_entry - iterate over list of given type |
| 44 | * @pos: the type * to use as a loop cursor. | 44 | * @pos: the type * to use as a loop cursor. |
| 45 | * @head: the head for your list. | 45 | * @head: the head for your list. |
| 46 | * @member: the name of the list_struct within the struct. | 46 | * @member: the name of the list_head within the struct. |
| 47 | */ | 47 | */ |
| 48 | #define list_for_each_entry(pos, head, member) \ | 48 | #define list_for_each_entry(pos, head, member) \ |
| 49 | for (pos = list_entry((head)->next, typeof(*pos), member); \ | 49 | for (pos = list_entry((head)->next, typeof(*pos), member); \ |
| @@ -55,7 +55,7 @@ struct list_head { | |||
| 55 | * @pos: the type * to use as a loop cursor. | 55 | * @pos: the type * to use as a loop cursor. |
| 56 | * @n: another type * to use as temporary storage | 56 | * @n: another type * to use as temporary storage |
| 57 | * @head: the head for your list. | 57 | * @head: the head for your list. |
| 58 | * @member: the name of the list_struct within the struct. | 58 | * @member: the name of the list_head within the struct. |
| 59 | */ | 59 | */ |
| 60 | #define list_for_each_entry_safe(pos, n, head, member) \ | 60 | #define list_for_each_entry_safe(pos, n, head, member) \ |
| 61 | for (pos = list_entry((head)->next, typeof(*pos), member), \ | 61 | for (pos = list_entry((head)->next, typeof(*pos), member), \ |
diff --git a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c index af4b0508be77..aaca1f44e788 100644 --- a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c +++ b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c | |||
| @@ -342,7 +342,7 @@ int main(int argc, char *argv[]) | |||
| 342 | iobuf[i].requested = ret; | 342 | iobuf[i].requested = ret; |
| 343 | printf("submit: %d requests buf: %d\n", ret, i); | 343 | printf("submit: %d requests buf: %d\n", ret, i); |
| 344 | } else | 344 | } else |
| 345 | perror("unable to submit reqests"); | 345 | perror("unable to submit requests"); |
| 346 | } | 346 | } |
| 347 | 347 | ||
| 348 | /* if event is ready to read */ | 348 | /* if event is ready to read */ |
diff --git a/tools/usb/usbip/libsrc/list.h b/tools/usb/usbip/libsrc/list.h index 8d0c936e184f..5eaaa78e2c6a 100644 --- a/tools/usb/usbip/libsrc/list.h +++ b/tools/usb/usbip/libsrc/list.h | |||
| @@ -98,7 +98,7 @@ static inline void list_del(struct list_head *entry) | |||
| 98 | * list_entry - get the struct for this entry | 98 | * list_entry - get the struct for this entry |
| 99 | * @ptr: the &struct list_head pointer. | 99 | * @ptr: the &struct list_head pointer. |
| 100 | * @type: the type of the struct this is embedded in. | 100 | * @type: the type of the struct this is embedded in. |
| 101 | * @member: the name of the list_struct within the struct. | 101 | * @member: the name of the list_head within the struct. |
| 102 | */ | 102 | */ |
| 103 | #define list_entry(ptr, type, member) \ | 103 | #define list_entry(ptr, type, member) \ |
| 104 | container_of(ptr, type, member) | 104 | container_of(ptr, type, member) |
