aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2013-11-14 17:32:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-14 19:32:21 -0500
commit16735d022f72b20ddbb2274b8e109f69575e9b2b (patch)
treef567c7dfff06ae18899feab7cd8a79a7a0f7be40 /drivers/memstick
parentc32f74ab2872994bc8336ed367313da3139350ca (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/memstick')
-rw-r--r--drivers/memstick/core/memstick.c2
-rw-r--r--drivers/memstick/host/r592.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index bbf4aea1627d..a0547dbf9806 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -253,7 +253,7 @@ void memstick_new_req(struct memstick_host *host)
253{ 253{
254 if (host->card) { 254 if (host->card) {
255 host->retries = cmd_retries; 255 host->retries = cmd_retries;
256 INIT_COMPLETION(host->card->mrq_complete); 256 reinit_completion(&host->card->mrq_complete);
257 host->request(host); 257 host->request(host);
258 } 258 }
259} 259}
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 1b6e91345222..31727bf285d0 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -290,7 +290,7 @@ static int r592_transfer_fifo_dma(struct r592_device *dev)
290 dbg_verbose("doing dma transfer"); 290 dbg_verbose("doing dma transfer");
291 291
292 dev->dma_error = 0; 292 dev->dma_error = 0;
293 INIT_COMPLETION(dev->dma_done); 293 reinit_completion(&dev->dma_done);
294 294
295 /* TODO: hidden assumption about nenth beeing always 1 */ 295 /* TODO: hidden assumption about nenth beeing always 1 */
296 sg_count = dma_map_sg(&dev->pci_dev->dev, &dev->req->sg, 1, is_write ? 296 sg_count = dma_map_sg(&dev->pci_dev->dev, &dev->req->sg, 1, is_write ?