diff options
author | Alexander Usyskin <alexander.usyskin@intel.com> | 2014-01-08 15:31:46 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-08 18:28:27 -0500 |
commit | 83ce07411dc2316aaaf95a0f193fa2fd76e2e739 (patch) | |
tree | 0dd2d0a55a3edc5bdd0052c3fcfc444db4148670 /drivers/misc/mei | |
parent | 0631213f3f6ee776db2fb2136778b570d6a17cab (diff) |
mei: fix syntax in comments and debug output
Fix syntax errors in comments and debug strings
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
-rw-r--r-- | drivers/misc/mei/amthif.c | 4 | ||||
-rw-r--r-- | drivers/misc/mei/client.c | 22 | ||||
-rw-r--r-- | drivers/misc/mei/debugfs.c | 4 | ||||
-rw-r--r-- | drivers/misc/mei/hbm.c | 18 | ||||
-rw-r--r-- | drivers/misc/mei/interrupt.c | 6 | ||||
-rw-r--r-- | drivers/misc/mei/main.c | 2 | ||||
-rw-r--r-- | drivers/misc/mei/mei_dev.h | 4 | ||||
-rw-r--r-- | drivers/misc/mei/nfc.c | 12 |
8 files changed, 36 insertions, 36 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index 29fcd57b8315..2fad84432829 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c | |||
@@ -177,7 +177,7 @@ int mei_amthif_read(struct mei_device *dev, struct file *file, | |||
177 | unsigned long timeout; | 177 | unsigned long timeout; |
178 | int i; | 178 | int i; |
179 | 179 | ||
180 | /* Only Posible if we are in timeout */ | 180 | /* Only possible if we are in timeout */ |
181 | if (!cl || cl != &dev->iamthif_cl) { | 181 | if (!cl || cl != &dev->iamthif_cl) { |
182 | dev_dbg(&dev->pdev->dev, "bad file ext.\n"); | 182 | dev_dbg(&dev->pdev->dev, "bad file ext.\n"); |
183 | return -ETIMEDOUT; | 183 | return -ETIMEDOUT; |
@@ -249,7 +249,7 @@ int mei_amthif_read(struct mei_device *dev, struct file *file, | |||
249 | cb->response_buffer.size); | 249 | cb->response_buffer.size); |
250 | dev_dbg(&dev->pdev->dev, "amthif cb->buf_idx - %lu\n", cb->buf_idx); | 250 | dev_dbg(&dev->pdev->dev, "amthif cb->buf_idx - %lu\n", cb->buf_idx); |
251 | 251 | ||
252 | /* length is being turncated to PAGE_SIZE, however, | 252 | /* length is being truncated to PAGE_SIZE, however, |
253 | * the buf_idx may point beyond */ | 253 | * the buf_idx may point beyond */ |
254 | length = min_t(size_t, length, (cb->buf_idx - *offset)); | 254 | length = min_t(size_t, length, (cb->buf_idx - *offset)); |
255 | 255 | ||
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c index f84d332ef059..4f268a377720 100644 --- a/drivers/misc/mei/client.c +++ b/drivers/misc/mei/client.c | |||
@@ -154,7 +154,7 @@ int mei_io_cb_alloc_req_buf(struct mei_cl_cb *cb, size_t length) | |||
154 | return 0; | 154 | return 0; |
155 | } | 155 | } |
156 | /** | 156 | /** |
157 | * mei_io_cb_alloc_resp_buf - allocate respose buffer | 157 | * mei_io_cb_alloc_resp_buf - allocate response buffer |
158 | * | 158 | * |
159 | * @cb: io callback structure | 159 | * @cb: io callback structure |
160 | * @length: size of the buffer | 160 | * @length: size of the buffer |
@@ -207,7 +207,7 @@ int mei_cl_flush_queues(struct mei_cl *cl) | |||
207 | 207 | ||
208 | 208 | ||
209 | /** | 209 | /** |
210 | * mei_cl_init - initializes intialize cl. | 210 | * mei_cl_init - initializes cl. |
211 | * | 211 | * |
212 | * @cl: host client to be initialized | 212 | * @cl: host client to be initialized |
213 | * @dev: mei device | 213 | * @dev: mei device |
@@ -263,10 +263,10 @@ struct mei_cl_cb *mei_cl_find_read_cb(struct mei_cl *cl) | |||
263 | return NULL; | 263 | return NULL; |
264 | } | 264 | } |
265 | 265 | ||
266 | /** mei_cl_link: allocte host id in the host map | 266 | /** mei_cl_link: allocate host id in the host map |
267 | * | 267 | * |
268 | * @cl - host client | 268 | * @cl - host client |
269 | * @id - fixed host id or -1 for genereting one | 269 | * @id - fixed host id or -1 for generic one |
270 | * | 270 | * |
271 | * returns 0 on success | 271 | * returns 0 on success |
272 | * -EINVAL on incorrect values | 272 | * -EINVAL on incorrect values |
@@ -282,19 +282,19 @@ int mei_cl_link(struct mei_cl *cl, int id) | |||
282 | 282 | ||
283 | dev = cl->dev; | 283 | dev = cl->dev; |
284 | 284 | ||
285 | /* If Id is not asigned get one*/ | 285 | /* If Id is not assigned get one*/ |
286 | if (id == MEI_HOST_CLIENT_ID_ANY) | 286 | if (id == MEI_HOST_CLIENT_ID_ANY) |
287 | id = find_first_zero_bit(dev->host_clients_map, | 287 | id = find_first_zero_bit(dev->host_clients_map, |
288 | MEI_CLIENTS_MAX); | 288 | MEI_CLIENTS_MAX); |
289 | 289 | ||
290 | if (id >= MEI_CLIENTS_MAX) { | 290 | if (id >= MEI_CLIENTS_MAX) { |
291 | dev_err(&dev->pdev->dev, "id exceded %d", MEI_CLIENTS_MAX) ; | 291 | dev_err(&dev->pdev->dev, "id exceeded %d", MEI_CLIENTS_MAX); |
292 | return -EMFILE; | 292 | return -EMFILE; |
293 | } | 293 | } |
294 | 294 | ||
295 | open_handle_count = dev->open_handle_count + dev->iamthif_open_count; | 295 | open_handle_count = dev->open_handle_count + dev->iamthif_open_count; |
296 | if (open_handle_count >= MEI_MAX_OPEN_HANDLE_COUNT) { | 296 | if (open_handle_count >= MEI_MAX_OPEN_HANDLE_COUNT) { |
297 | dev_err(&dev->pdev->dev, "open_handle_count exceded %d", | 297 | dev_err(&dev->pdev->dev, "open_handle_count exceeded %d", |
298 | MEI_MAX_OPEN_HANDLE_COUNT); | 298 | MEI_MAX_OPEN_HANDLE_COUNT); |
299 | return -EMFILE; | 299 | return -EMFILE; |
300 | } | 300 | } |
@@ -376,7 +376,7 @@ void mei_host_client_init(struct work_struct *work) | |||
376 | 376 | ||
377 | 377 | ||
378 | /** | 378 | /** |
379 | * mei_cl_disconnect - disconnect host clinet form the me one | 379 | * mei_cl_disconnect - disconnect host client from the me one |
380 | * | 380 | * |
381 | * @cl: host client | 381 | * @cl: host client |
382 | * | 382 | * |
@@ -455,7 +455,7 @@ free: | |||
455 | * | 455 | * |
456 | * @cl: private data of the file object | 456 | * @cl: private data of the file object |
457 | * | 457 | * |
458 | * returns ture if other client is connected, 0 - otherwise. | 458 | * returns true if other client is connected, false - otherwise. |
459 | */ | 459 | */ |
460 | bool mei_cl_is_other_connecting(struct mei_cl *cl) | 460 | bool mei_cl_is_other_connecting(struct mei_cl *cl) |
461 | { | 461 | { |
@@ -479,7 +479,7 @@ bool mei_cl_is_other_connecting(struct mei_cl *cl) | |||
479 | } | 479 | } |
480 | 480 | ||
481 | /** | 481 | /** |
482 | * mei_cl_connect - connect host clinet to the me one | 482 | * mei_cl_connect - connect host client to the me one |
483 | * | 483 | * |
484 | * @cl: host client | 484 | * @cl: host client |
485 | * | 485 | * |
@@ -774,7 +774,7 @@ int mei_cl_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb, | |||
774 | * @cl: host client | 774 | * @cl: host client |
775 | * @cl: write callback with filled data | 775 | * @cl: write callback with filled data |
776 | * | 776 | * |
777 | * returns numbe of bytes sent on success, <0 on failure. | 777 | * returns number of bytes sent on success, <0 on failure. |
778 | */ | 778 | */ |
779 | int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking) | 779 | int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking) |
780 | { | 780 | { |
diff --git a/drivers/misc/mei/debugfs.c b/drivers/misc/mei/debugfs.c index e3870f22d238..a3ae154444b2 100644 --- a/drivers/misc/mei/debugfs.c +++ b/drivers/misc/mei/debugfs.c | |||
@@ -43,7 +43,7 @@ static ssize_t mei_dbgfs_read_meclients(struct file *fp, char __user *ubuf, | |||
43 | 43 | ||
44 | mutex_lock(&dev->device_lock); | 44 | mutex_lock(&dev->device_lock); |
45 | 45 | ||
46 | /* if the driver is not enabled the list won't b consitent */ | 46 | /* if the driver is not enabled the list won't be consistent */ |
47 | if (dev->dev_state != MEI_DEV_ENABLED) | 47 | if (dev->dev_state != MEI_DEV_ENABLED) |
48 | goto out; | 48 | goto out; |
49 | 49 | ||
@@ -101,7 +101,7 @@ static const struct file_operations mei_dbgfs_fops_devstate = { | |||
101 | 101 | ||
102 | /** | 102 | /** |
103 | * mei_dbgfs_deregister - Remove the debugfs files and directories | 103 | * mei_dbgfs_deregister - Remove the debugfs files and directories |
104 | * @mei - pointer to mei device private dat | 104 | * @mei - pointer to mei device private data |
105 | */ | 105 | */ |
106 | void mei_dbgfs_deregister(struct mei_device *dev) | 106 | void mei_dbgfs_deregister(struct mei_device *dev) |
107 | { | 107 | { |
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c index 836f92db7983..8520cdfa2f05 100644 --- a/drivers/misc/mei/hbm.c +++ b/drivers/misc/mei/hbm.c | |||
@@ -83,12 +83,12 @@ void mei_hbm_cl_hdr(struct mei_cl *cl, u8 hbm_cmd, void *buf, size_t len) | |||
83 | } | 83 | } |
84 | 84 | ||
85 | /** | 85 | /** |
86 | * same_disconn_addr - tells if they have the same address | 86 | * mei_hbm_cl_addr_equal - tells if they have the same address |
87 | * | 87 | * |
88 | * @file: private data of the file object. | 88 | * @cl: - client |
89 | * @disconn: disconnection request. | 89 | * @buf: buffer with cl header |
90 | * | 90 | * |
91 | * returns true if addres are same | 91 | * returns true if addresses are the same |
92 | */ | 92 | */ |
93 | static inline | 93 | static inline |
94 | bool mei_hbm_cl_addr_equal(struct mei_cl *cl, void *buf) | 94 | bool mei_hbm_cl_addr_equal(struct mei_cl *cl, void *buf) |
@@ -283,7 +283,7 @@ static int mei_hbm_prop_req(struct mei_device *dev) | |||
283 | } | 283 | } |
284 | 284 | ||
285 | /** | 285 | /** |
286 | * mei_hbm_stop_req_prepare - perpare stop request message | 286 | * mei_hbm_stop_req_prepare - prepare stop request message |
287 | * | 287 | * |
288 | * @dev - mei device | 288 | * @dev - mei device |
289 | * @mei_hdr - mei message header | 289 | * @mei_hdr - mei message header |
@@ -304,7 +304,7 @@ static void mei_hbm_stop_req_prepare(struct mei_device *dev, | |||
304 | } | 304 | } |
305 | 305 | ||
306 | /** | 306 | /** |
307 | * mei_hbm_cl_flow_control_req - sends flow control requst. | 307 | * mei_hbm_cl_flow_control_req - sends flow control request. |
308 | * | 308 | * |
309 | * @dev: the device structure | 309 | * @dev: the device structure |
310 | * @cl: client info | 310 | * @cl: client info |
@@ -466,7 +466,7 @@ int mei_hbm_cl_connect_req(struct mei_device *dev, struct mei_cl *cl) | |||
466 | } | 466 | } |
467 | 467 | ||
468 | /** | 468 | /** |
469 | * mei_hbm_cl_connect_res - connect resposne from the ME | 469 | * mei_hbm_cl_connect_res - connect response from the ME |
470 | * | 470 | * |
471 | * @dev: the device structure | 471 | * @dev: the device structure |
472 | * @rs: connect response bus message | 472 | * @rs: connect response bus message |
@@ -520,8 +520,8 @@ static void mei_hbm_cl_connect_res(struct mei_device *dev, | |||
520 | 520 | ||
521 | 521 | ||
522 | /** | 522 | /** |
523 | * mei_hbm_fw_disconnect_req - disconnect request initiated by me | 523 | * mei_hbm_fw_disconnect_req - disconnect request initiated by ME firmware |
524 | * host sends disoconnect response | 524 | * host sends disconnect response |
525 | * | 525 | * |
526 | * @dev: the device structure. | 526 | * @dev: the device structure. |
527 | * @disconnect_req: disconnect request bus message from the me | 527 | * @disconnect_req: disconnect request bus message from the me |
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index 206dbe99bedd..2a7277de7ca1 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | 32 | ||
33 | /** | 33 | /** |
34 | * mei_irq_compl_handler - dispatch complete handelers | 34 | * mei_irq_compl_handler - dispatch complete handlers |
35 | * for the completed callbacks | 35 | * for the completed callbacks |
36 | * | 36 | * |
37 | * @dev - mei device | 37 | * @dev - mei device |
@@ -338,7 +338,7 @@ int mei_irq_read_handler(struct mei_device *dev, | |||
338 | goto reset_slots; | 338 | goto reset_slots; |
339 | } | 339 | } |
340 | 340 | ||
341 | /* find recepient cl */ | 341 | /* find recipient cl */ |
342 | list_for_each_entry(cl, &dev->file_list, link) { | 342 | list_for_each_entry(cl, &dev->file_list, link) { |
343 | if (mei_cl_hbm_equal(cl, mei_hdr)) { | 343 | if (mei_cl_hbm_equal(cl, mei_hdr)) { |
344 | cl_dbg(dev, cl, "got a message\n"); | 344 | cl_dbg(dev, cl, "got a message\n"); |
@@ -346,7 +346,7 @@ int mei_irq_read_handler(struct mei_device *dev, | |||
346 | } | 346 | } |
347 | } | 347 | } |
348 | 348 | ||
349 | /* if no recepient cl was found we assume corrupted header\n */ | 349 | /* if no recipient cl was found we assume corrupted header */ |
350 | if (&cl->link == &dev->file_list) { | 350 | if (&cl->link == &dev->file_list) { |
351 | dev_err(&dev->pdev->dev, "no destination client found 0x%08X\n", | 351 | dev_err(&dev->pdev->dev, "no destination client found 0x%08X\n", |
352 | dev->rd_msg_hdr); | 352 | dev->rd_msg_hdr); |
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 9661a812f550..5424f8ff3f7f 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c | |||
@@ -48,7 +48,7 @@ | |||
48 | * | 48 | * |
49 | * @inode: pointer to inode structure | 49 | * @inode: pointer to inode structure |
50 | * @file: pointer to file structure | 50 | * @file: pointer to file structure |
51 | e | 51 | * |
52 | * returns 0 on success, <0 on error | 52 | * returns 0 on success, <0 on error |
53 | */ | 53 | */ |
54 | static int mei_open(struct inode *inode, struct file *file) | 54 | static int mei_open(struct inode *inode, struct file *file) |
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index 3f242e15f8f1..2c7692807a4a 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h | |||
@@ -65,7 +65,7 @@ extern const uuid_le mei_wd_guid; | |||
65 | * that can be opened to the driver. | 65 | * that can be opened to the driver. |
66 | * | 66 | * |
67 | * Limit to 255: 256 Total Clients | 67 | * Limit to 255: 256 Total Clients |
68 | * minus internal client for MEI Bus Messags | 68 | * minus internal client for MEI Bus Messages |
69 | */ | 69 | */ |
70 | #define MEI_MAX_OPEN_HANDLE_COUNT (MEI_CLIENTS_MAX - 1) | 70 | #define MEI_MAX_OPEN_HANDLE_COUNT (MEI_CLIENTS_MAX - 1) |
71 | 71 | ||
@@ -181,7 +181,7 @@ struct mei_cl_cb { | |||
181 | u32 internal:1; | 181 | u32 internal:1; |
182 | }; | 182 | }; |
183 | 183 | ||
184 | /* MEI client instance carried as file->pirvate_data*/ | 184 | /* MEI client instance carried as file->private_data*/ |
185 | struct mei_cl { | 185 | struct mei_cl { |
186 | struct list_head link; | 186 | struct list_head link; |
187 | struct mei_device *dev; | 187 | struct mei_device *dev; |
diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c index 54961903bf21..a58320c0c049 100644 --- a/drivers/misc/mei/nfc.c +++ b/drivers/misc/mei/nfc.c | |||
@@ -92,7 +92,7 @@ struct mei_nfc_hci_hdr { | |||
92 | * @cl: NFC host client | 92 | * @cl: NFC host client |
93 | * @cl_info: NFC info host client | 93 | * @cl_info: NFC info host client |
94 | * @init_work: perform connection to the info client | 94 | * @init_work: perform connection to the info client |
95 | * @fw_ivn: NFC Intervace Version Number | 95 | * @fw_ivn: NFC Interface Version Number |
96 | * @vendor_id: NFC manufacturer ID | 96 | * @vendor_id: NFC manufacturer ID |
97 | * @radio_type: NFC radio type | 97 | * @radio_type: NFC radio type |
98 | */ | 98 | */ |
@@ -163,7 +163,7 @@ static int mei_nfc_build_bus_name(struct mei_nfc_dev *ndev) | |||
163 | return 0; | 163 | return 0; |
164 | 164 | ||
165 | default: | 165 | default: |
166 | dev_err(&dev->pdev->dev, "Unknow radio type 0x%x\n", | 166 | dev_err(&dev->pdev->dev, "Unknown radio type 0x%x\n", |
167 | ndev->radio_type); | 167 | ndev->radio_type); |
168 | 168 | ||
169 | return -EINVAL; | 169 | return -EINVAL; |
@@ -175,14 +175,14 @@ static int mei_nfc_build_bus_name(struct mei_nfc_dev *ndev) | |||
175 | ndev->bus_name = "pn544"; | 175 | ndev->bus_name = "pn544"; |
176 | return 0; | 176 | return 0; |
177 | default: | 177 | default: |
178 | dev_err(&dev->pdev->dev, "Unknow radio type 0x%x\n", | 178 | dev_err(&dev->pdev->dev, "Unknown radio type 0x%x\n", |
179 | ndev->radio_type); | 179 | ndev->radio_type); |
180 | 180 | ||
181 | return -EINVAL; | 181 | return -EINVAL; |
182 | } | 182 | } |
183 | 183 | ||
184 | default: | 184 | default: |
185 | dev_err(&dev->pdev->dev, "Unknow vendor ID 0x%x\n", | 185 | dev_err(&dev->pdev->dev, "Unknown vendor ID 0x%x\n", |
186 | ndev->vendor_id); | 186 | ndev->vendor_id); |
187 | 187 | ||
188 | return -EINVAL; | 188 | return -EINVAL; |
@@ -428,7 +428,7 @@ static void mei_nfc_init(struct work_struct *work) | |||
428 | mutex_unlock(&dev->device_lock); | 428 | mutex_unlock(&dev->device_lock); |
429 | 429 | ||
430 | if (mei_nfc_if_version(ndev) < 0) { | 430 | if (mei_nfc_if_version(ndev) < 0) { |
431 | dev_err(&dev->pdev->dev, "Could not get the NFC interfave version"); | 431 | dev_err(&dev->pdev->dev, "Could not get the NFC interface version"); |
432 | 432 | ||
433 | goto err; | 433 | goto err; |
434 | } | 434 | } |
@@ -483,7 +483,7 @@ int mei_nfc_host_init(struct mei_device *dev) | |||
483 | struct mei_cl *cl_info, *cl = NULL; | 483 | struct mei_cl *cl_info, *cl = NULL; |
484 | int i, ret; | 484 | int i, ret; |
485 | 485 | ||
486 | /* already initialzed */ | 486 | /* already initialized */ |
487 | if (ndev->cl_info) | 487 | if (ndev->cl_info) |
488 | return 0; | 488 | return 0; |
489 | 489 | ||