aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-01-08 16:07:24 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-08 19:40:46 -0500
commitd025284d06458367cd833a5aceca901fb6da3785 (patch)
treebe6d59395c7ffdff4cb10ec9344f71d0e0abbecb /drivers/misc
parent6222f7bf8d7e2b16ffcc14bcb2c32ea069aac9fa (diff)
mei: hw-me.c fix kernel doc
Fix the kernel doc for the functions in hw-me.c Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/hw-me.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index 4e6b657cd806..1e82e3311ea2 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -49,17 +49,13 @@ static inline void mei_reg_write(const struct mei_device *dev,
49} 49}
50 50
51/** 51/**
52 * mei_hcsr_read - Reads 32bit data from the host CSR 52 * mei_mecbrw_read - Reads 32bit data from ME circular buffer
53 * read window register
53 * 54 *
54 * @dev: the device structure 55 * @dev: the device structure
55 * 56 *
56 * returns the byte read. 57 * returns ME_CB_RW register value (u32)
57 */ 58 */
58u32 mei_hcsr_read(const struct mei_device *dev)
59{
60 return mei_reg_read(dev, H_CSR);
61}
62
63u32 mei_mecbrw_read(const struct mei_device *dev) 59u32 mei_mecbrw_read(const struct mei_device *dev)
64{ 60{
65 return mei_reg_read(dev, ME_CB_RW); 61 return mei_reg_read(dev, ME_CB_RW);
@@ -77,13 +73,26 @@ u32 mei_mecsr_read(const struct mei_device *dev)
77} 73}
78 74
79/** 75/**
80 * mei_set_csr_register - writes H_CSR register to the mei device, 76 * mei_hcsr_read - Reads 32bit data from the host CSR
77 *
78 * @dev: the device structure
79 *
80 * returns H_CSR register value (u32)
81 */
82u32 mei_hcsr_read(const struct mei_device *dev)
83{
84 return mei_reg_read(dev, H_CSR);
85}
86
87/**
88 * mei_hcsr_set - writes H_CSR register to the mei device,
81 * and ignores the H_IS bit for it is write-one-to-zero. 89 * and ignores the H_IS bit for it is write-one-to-zero.
82 * 90 *
83 * @dev: the device structure 91 * @dev: the device structure
84 */ 92 */
85void mei_hcsr_set(struct mei_device *dev) 93void mei_hcsr_set(struct mei_device *dev)
86{ 94{
95
87 if ((dev->host_hw_state & H_IS) == H_IS) 96 if ((dev->host_hw_state & H_IS) == H_IS)
88 dev->host_hw_state &= ~H_IS; 97 dev->host_hw_state &= ~H_IS;
89 mei_reg_write(dev, H_CSR, dev->host_hw_state); 98 mei_reg_write(dev, H_CSR, dev->host_hw_state);
@@ -91,7 +100,7 @@ void mei_hcsr_set(struct mei_device *dev)
91} 100}
92 101
93/** 102/**
94 * mei_enable_interrupts - clear and stop interrupts 103 * mei_clear_interrupts - clear and stop interrupts
95 * 104 *
96 * @dev: the device structure 105 * @dev: the device structure
97 */ 106 */