diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
commit | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch) | |
tree | 734289dc85074903d9e636a935d43414746e222c /drivers/misc/mei/interrupt.c | |
parent | 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff) | |
parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
code cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
mm: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
m32r: Convert print_symbol to %pSR
iostats.txt: add easy-to-find description for field 6
x86 cmpxchg.h: fix wrong comment
treewide: Fix typo in printk and comments
doc: devicetree: Fix various typos
docbook: fix 8250 naming in device-drivers
pata_pdc2027x: Fix compiler warning
treewide: Fix typo in printks
mei: Fix comments in drivers/misc/mei
treewide: Fix typos in kernel messages
pm44xx: Fix comment for "CONFIG_CPU_IDLE"
doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
mmzone: correct "pags" to "pages" in comment.
kernel-parameters: remove outdated 'noresidual' parameter
Remove spurious _H suffixes from ifdef comments
sound: Remove stray pluses from Kconfig file
radio-shark: Fix printk "CONFIG_LED_CLASS"
doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
...
Diffstat (limited to 'drivers/misc/mei/interrupt.c')
-rw-r--r-- | drivers/misc/mei/interrupt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index 1473cfdbc426..2ad736989410 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c | |||
@@ -230,7 +230,7 @@ static int _mei_irq_thread_close(struct mei_device *dev, s32 *slots, | |||
230 | 230 | ||
231 | 231 | ||
232 | /** | 232 | /** |
233 | * _mei_hb_read - processes read related operation. | 233 | * _mei_irq_thread_read - processes read related operation. |
234 | * | 234 | * |
235 | * @dev: the device structure. | 235 | * @dev: the device structure. |
236 | * @slots: free slots. | 236 | * @slots: free slots. |
@@ -369,7 +369,7 @@ static int mei_irq_thread_write_complete(struct mei_device *dev, s32 *slots, | |||
369 | } | 369 | } |
370 | 370 | ||
371 | /** | 371 | /** |
372 | * mei_irq_thread_read_handler - bottom half read routine after ISR to | 372 | * mei_irq_read_handler - bottom half read routine after ISR to |
373 | * handle the read processing. | 373 | * handle the read processing. |
374 | * | 374 | * |
375 | * @dev: the device structure | 375 | * @dev: the device structure |