diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-11-14 17:32:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:21 -0500 |
commit | 16735d022f72b20ddbb2274b8e109f69575e9b2b (patch) | |
tree | f567c7dfff06ae18899feab7cd8a79a7a0f7be40 /drivers/misc/ti-st/st_kim.c | |
parent | c32f74ab2872994bc8336ed367313da3139350ca (diff) |
tree-wide: use reinit_completion instead of INIT_COMPLETION
Use this new function to make code more comprehensible, since we are
reinitialzing the completion, not initializing.
[akpm@linux-foundation.org: linux-next resyncs]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/ti-st/st_kim.c')
-rw-r--r-- | drivers/misc/ti-st/st_kim.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index 83907c720594..96853a09788a 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c | |||
@@ -218,7 +218,7 @@ static long read_local_version(struct kim_data_s *kim_gdata, char *bts_scr_name) | |||
218 | 218 | ||
219 | pr_debug("%s", __func__); | 219 | pr_debug("%s", __func__); |
220 | 220 | ||
221 | INIT_COMPLETION(kim_gdata->kim_rcvd); | 221 | reinit_completion(&kim_gdata->kim_rcvd); |
222 | if (4 != st_int_write(kim_gdata->core_data, read_ver_cmd, 4)) { | 222 | if (4 != st_int_write(kim_gdata->core_data, read_ver_cmd, 4)) { |
223 | pr_err("kim: couldn't write 4 bytes"); | 223 | pr_err("kim: couldn't write 4 bytes"); |
224 | return -EIO; | 224 | return -EIO; |
@@ -229,7 +229,7 @@ static long read_local_version(struct kim_data_s *kim_gdata, char *bts_scr_name) | |||
229 | pr_err(" waiting for ver info- timed out "); | 229 | pr_err(" waiting for ver info- timed out "); |
230 | return -ETIMEDOUT; | 230 | return -ETIMEDOUT; |
231 | } | 231 | } |
232 | INIT_COMPLETION(kim_gdata->kim_rcvd); | 232 | reinit_completion(&kim_gdata->kim_rcvd); |
233 | /* the positions 12 & 13 in the response buffer provide with the | 233 | /* the positions 12 & 13 in the response buffer provide with the |
234 | * chip, major & minor numbers | 234 | * chip, major & minor numbers |
235 | */ | 235 | */ |
@@ -362,7 +362,7 @@ static long download_firmware(struct kim_data_s *kim_gdata) | |||
362 | /* reinit completion before sending for the | 362 | /* reinit completion before sending for the |
363 | * relevant wait | 363 | * relevant wait |
364 | */ | 364 | */ |
365 | INIT_COMPLETION(kim_gdata->kim_rcvd); | 365 | reinit_completion(&kim_gdata->kim_rcvd); |
366 | 366 | ||
367 | /* | 367 | /* |
368 | * Free space found in uart buffer, call st_int_write | 368 | * Free space found in uart buffer, call st_int_write |
@@ -398,7 +398,7 @@ static long download_firmware(struct kim_data_s *kim_gdata) | |||
398 | release_firmware(kim_gdata->fw_entry); | 398 | release_firmware(kim_gdata->fw_entry); |
399 | return -ETIMEDOUT; | 399 | return -ETIMEDOUT; |
400 | } | 400 | } |
401 | INIT_COMPLETION(kim_gdata->kim_rcvd); | 401 | reinit_completion(&kim_gdata->kim_rcvd); |
402 | break; | 402 | break; |
403 | case ACTION_DELAY: /* sleep */ | 403 | case ACTION_DELAY: /* sleep */ |
404 | pr_info("sleep command in scr"); | 404 | pr_info("sleep command in scr"); |
@@ -474,7 +474,7 @@ long st_kim_start(void *kim_data) | |||
474 | gpio_set_value(kim_gdata->nshutdown, GPIO_HIGH); | 474 | gpio_set_value(kim_gdata->nshutdown, GPIO_HIGH); |
475 | mdelay(100); | 475 | mdelay(100); |
476 | /* re-initialize the completion */ | 476 | /* re-initialize the completion */ |
477 | INIT_COMPLETION(kim_gdata->ldisc_installed); | 477 | reinit_completion(&kim_gdata->ldisc_installed); |
478 | /* send notification to UIM */ | 478 | /* send notification to UIM */ |
479 | kim_gdata->ldisc_install = 1; | 479 | kim_gdata->ldisc_install = 1; |
480 | pr_info("ldisc_install = 1"); | 480 | pr_info("ldisc_install = 1"); |
@@ -525,7 +525,7 @@ long st_kim_stop(void *kim_data) | |||
525 | kim_gdata->kim_pdev->dev.platform_data; | 525 | kim_gdata->kim_pdev->dev.platform_data; |
526 | struct tty_struct *tty = kim_gdata->core_data->tty; | 526 | struct tty_struct *tty = kim_gdata->core_data->tty; |
527 | 527 | ||
528 | INIT_COMPLETION(kim_gdata->ldisc_installed); | 528 | reinit_completion(&kim_gdata->ldisc_installed); |
529 | 529 | ||
530 | if (tty) { /* can be called before ldisc is installed */ | 530 | if (tty) { /* can be called before ldisc is installed */ |
531 | /* Flush any pending characters in the driver and discipline. */ | 531 | /* Flush any pending characters in the driver and discipline. */ |