diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 18:36:50 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 18:36:50 +0200 |
commit | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch) | |
tree | 734289dc85074903d9e636a935d43414746e222c /drivers/misc | |
parent | Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | mm: Convert print_symbol to %pSR (diff) | |
download | linux-5d434fcb255dec99189f1c58a06e4f56e12bf77d.tar.xz linux-5d434fcb255dec99189f1c58a06e4f56e12bf77d.zip |
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')
-rw-r--r-- | drivers/misc/mei/amthif.c | 6 | ||||
-rw-r--r-- | drivers/misc/mei/client.c | 24 | ||||
-rw-r--r-- | drivers/misc/mei/hbm.c | 9 | ||||
-rw-r--r-- | drivers/misc/mei/hw-me.c | 8 | ||||
-rw-r--r-- | drivers/misc/mei/interrupt.c | 4 | ||||
-rw-r--r-- | drivers/misc/mei/pci-me.c | 1 | ||||
-rw-r--r-- | drivers/misc/mei/wd.c | 1 |
7 files changed, 28 insertions, 25 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index 31a6212cb8b1..b3e50984d2c8 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -60,7 +60,7 @@ void mei_amthif_reset_params(struct mei_device *dev) } /** - * mei_amthif_host_init_ - mei initialization amthif client. + * mei_amthif_host_init - mei initialization amthif client. * * @dev: the device structure * @@ -433,7 +433,7 @@ unsigned int mei_amthif_poll(struct mei_device *dev, /** - * mei_amthif_irq_process_completed - processes completed iamthif operation. + * mei_amthif_irq_write_completed - processes completed iamthif operation. * * @dev: the device structure. * @slots: free slots. @@ -704,7 +704,7 @@ static bool mei_clear_lists(struct mei_device *dev, struct file *file) /** * mei_amthif_release - the release function * -* @inode: pointer to inode structure +* @dev: device structure * @file: pointer to file structure * * returns 0 on success, <0 on error diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c index 71892745e2e8..e310ca6ed1a3 100644 --- a/drivers/misc/mei/client.c +++ b/drivers/misc/mei/client.c @@ -109,7 +109,7 @@ void mei_io_cb_free(struct mei_cl_cb *cb) * mei_io_cb_init - allocate and initialize io callback * * @cl - mei client - * @file: pointer to file structure + * @fp: pointer to file structure * * returns mei_cl_cb pointer or NULL; */ @@ -132,8 +132,8 @@ struct mei_cl_cb *mei_io_cb_init(struct mei_cl *cl, struct file *fp) /** * mei_io_cb_alloc_req_buf - allocate request buffer * - * @cb - io callback structure - * @size: size of the buffer + * @cb: io callback structure + * @length: size of the buffer * * returns 0 on success * -EINVAL if cb is NULL @@ -154,10 +154,10 @@ int mei_io_cb_alloc_req_buf(struct mei_cl_cb *cb, size_t length) return 0; } /** - * mei_io_cb_alloc_req_buf - allocate respose buffer + * mei_io_cb_alloc_resp_buf - allocate respose buffer * - * @cb - io callback structure - * @size: size of the buffer + * @cb: io callback structure + * @length: size of the buffer * * returns 0 on success * -EINVAL if cb is NULL @@ -183,7 +183,6 @@ int mei_io_cb_alloc_resp_buf(struct mei_cl_cb *cb, size_t length) /** * mei_cl_flush_queues - flushes queue lists belonging to cl. * - * @dev: the device structure * @cl: host client */ int mei_cl_flush_queues(struct mei_cl *cl) @@ -244,7 +243,8 @@ struct mei_cl *mei_cl_allocate(struct mei_device *dev) /** * mei_cl_find_read_cb - find this cl's callback in the read list * - * @dev: device structure + * @cl: host client + * * returns cb on success, NULL on error */ struct mei_cl_cb *mei_cl_find_read_cb(struct mei_cl *cl) @@ -263,6 +263,7 @@ struct mei_cl_cb *mei_cl_find_read_cb(struct mei_cl *cl) * * @cl - host client * @id - fixed host id or -1 for genereting one + * * returns 0 on success * -EINVAL on incorrect values * -ENONET if client not found @@ -302,7 +303,7 @@ int mei_cl_link(struct mei_cl *cl, int id) /** * mei_cl_unlink - remove me_cl from the list * - * @dev: the device structure + * @cl: host client */ int mei_cl_unlink(struct mei_cl *cl) { @@ -538,7 +539,6 @@ out: /** * mei_cl_flow_ctrl_creds - checks flow_control credits for cl. * - * @dev: the device structure * @cl: private data of the file object * * returns 1 if mei_flow_ctrl_creds >0, 0 - otherwise. @@ -579,8 +579,8 @@ int mei_cl_flow_ctrl_creds(struct mei_cl *cl) /** * mei_cl_flow_ctrl_reduce - reduces flow_control. * - * @dev: the device structure * @cl: private data of the file object + * * @returns * 0 on success * -ENOENT when me client is not found @@ -618,7 +618,7 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl) } /** - * mei_cl_start_read - the start read client message function. + * mei_cl_read_start - the start read client message function. * * @cl: host client * diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c index db605f5cf187..6916045166eb 100644 --- a/drivers/misc/mei/hbm.c +++ b/drivers/misc/mei/hbm.c @@ -62,6 +62,7 @@ static void mei_hbm_me_cl_allocate(struct mei_device *dev) /** * mei_hbm_cl_hdr - construct client hbm header + * * @cl: - client * @hbm_cmd: host bus message command * @buf: buffer for cl header @@ -206,7 +207,7 @@ static void mei_hbm_enum_clients_req(struct mei_device *dev) } /** - * mei_hbm_prop_requsest - request property for a single client + * mei_hbm_prop_req - request property for a single client * * @dev: the device structure * @@ -306,9 +307,9 @@ int mei_hbm_cl_flow_control_req(struct mei_device *dev, struct mei_cl *cl) } /** - * add_single_flow_creds - adds single buffer credentials. + * mei_hbm_add_single_flow_creds - adds single buffer credentials. * - * @file: private data ot the file object. + * @dev: the device structure * @flow: flow control. */ static void mei_hbm_add_single_flow_creds(struct mei_device *dev, @@ -500,7 +501,7 @@ static void mei_hbm_cl_connect_res(struct mei_device *dev, /** - * mei_client_disconnect_request - disconnect request initiated by me + * mei_hbm_fw_disconnect_req - disconnect request initiated by me * host sends disoconnect response * * @dev: the device structure. diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index fc032270916a..822170f00348 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -103,7 +103,7 @@ static inline void mei_hcsr_set(struct mei_me_hw *hw, u32 hcsr) /** - * me_hw_config - configure hw dependent settings + * mei_me_hw_config - configure hw dependent settings * * @dev: mei device */ @@ -169,7 +169,7 @@ static void mei_me_hw_reset_release(struct mei_device *dev) * mei_me_hw_reset - resets fw via mei csr register. * * @dev: the device structure - * @interrupts_enabled: if interrupt should be enabled after reset. + * @intr_enable: if interrupt should be enabled after reset. */ static void mei_me_hw_reset(struct mei_device *dev, bool intr_enable) { @@ -285,7 +285,7 @@ static unsigned char mei_hbuf_filled_slots(struct mei_device *dev) } /** - * mei_hbuf_is_empty - checks if host buffer is empty. + * mei_me_hbuf_is_empty - checks if host buffer is empty. * * @dev: the device structure * @@ -554,7 +554,7 @@ static const struct mei_hw_ops mei_me_hw_ops = { }; /** - * init_mei_device - allocates and initializes the mei device structure + * mei_me_dev_init - allocates and initializes the mei device structure * * @pdev: The pci device structure * 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, /** - * _mei_hb_read - processes read related operation. + * _mei_irq_thread_read - processes read related operation. * * @dev: the device structure. * @slots: free slots. @@ -369,7 +369,7 @@ static int mei_irq_thread_write_complete(struct mei_device *dev, s32 *slots, } /** - * mei_irq_thread_read_handler - bottom half read routine after ISR to + * mei_irq_read_handler - bottom half read routine after ISR to * handle the read processing. * * @dev: the device structure diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 88aec6a90ff4..a727464e9c3f 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -92,6 +92,7 @@ static DEFINE_MUTEX(mei_mutex); /** * mei_quirk_probe - probe for devices that doesn't valid ME interface + * * @pdev: PCI device structure * @ent: entry into pci_device_table * diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c index eb3f05c8d7d0..6251a4ee7067 100644 --- a/drivers/misc/mei/wd.c +++ b/drivers/misc/mei/wd.c @@ -58,6 +58,7 @@ static void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout) * mei_wd_host_init - connect to the watchdog client * * @dev: the device structure + * * returns -ENENT if wd client cannot be found * -EIO if write has failed * 0 on success |