diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 13:08:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 13:08:06 -0500 |
commit | a7cb7bb664543e4562ab0e9a072470d2d18c761f (patch) | |
tree | 7c72fbbc681617be8c89b63c7e98a7e7b09c72de /drivers | |
parent | ccb5a4910d0ca7b1742b9217db2e1b95817e25ac (diff) | |
parent | 078014dd36989c66378dfe80066c3f8a1f6952e8 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree update from Jiri Kosina:
"Usual stuff: documentation updates, printk() fixes, etc"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
intel_ips: fix a type in error message
cpufreq: cpufreq-dt: Move newline to end of error message
ps3rom: fix error return code
treewide: fix typo in printk and Kconfig
ARM: dts: bcm63138: change "interupts" to "interrupts"
Replace mentions of "list_struct" to "list_head"
kernel: trace: fix printk message
scsi: mpt2sas: fix ioctl in comment
zbud, zswap: change module author email
clocksource: Fix 'clcoksource' typo in comment
arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help
gpio: msm-v1: make boolean argument more obvious
usb: Fix typo in usb-serial-simple.c
PCI: Fix comment typo 'COMFIG_PM_OPS'
powerpc: Fix comment typo 'CONIFG_8xx'
powerpc: Fix comment typos 'CONFiG_ALTIVEC'
clk: st: Spelling s/stucture/structure/
isci: Spelling s/stucture/structure/
usb: gadget: zero: Spelling s/infrastucture/infrastructure/
treewide: Fix company name in module descriptions
...
Diffstat (limited to 'drivers')
27 files changed, 39 insertions, 38 deletions
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"); |