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 /arch/powerpc/platforms/powermac/low_i2c.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 'arch/powerpc/platforms/powermac/low_i2c.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/low_i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c index fc536f2971c0..7553b6a77c64 100644 --- a/arch/powerpc/platforms/powermac/low_i2c.c +++ b/arch/powerpc/platforms/powermac/low_i2c.c | |||
@@ -452,7 +452,7 @@ static int kw_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize, | |||
452 | */ | 452 | */ |
453 | if (use_irq) { | 453 | if (use_irq) { |
454 | /* Clear completion */ | 454 | /* Clear completion */ |
455 | INIT_COMPLETION(host->complete); | 455 | reinit_completion(&host->complete); |
456 | /* Ack stale interrupts */ | 456 | /* Ack stale interrupts */ |
457 | kw_write_reg(reg_isr, kw_read_reg(reg_isr)); | 457 | kw_write_reg(reg_isr, kw_read_reg(reg_isr)); |
458 | /* Arm timeout */ | 458 | /* Arm timeout */ |
@@ -717,7 +717,7 @@ static int pmu_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize, | |||
717 | return -EINVAL; | 717 | return -EINVAL; |
718 | } | 718 | } |
719 | 719 | ||
720 | INIT_COMPLETION(comp); | 720 | reinit_completion(&comp); |
721 | req->data[0] = PMU_I2C_CMD; | 721 | req->data[0] = PMU_I2C_CMD; |
722 | req->reply[0] = 0xff; | 722 | req->reply[0] = 0xff; |
723 | req->nbytes = sizeof(struct pmu_i2c_hdr) + 1; | 723 | req->nbytes = sizeof(struct pmu_i2c_hdr) + 1; |
@@ -748,7 +748,7 @@ static int pmu_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize, | |||
748 | 748 | ||
749 | hdr->bus = PMU_I2C_BUS_STATUS; | 749 | hdr->bus = PMU_I2C_BUS_STATUS; |
750 | 750 | ||
751 | INIT_COMPLETION(comp); | 751 | reinit_completion(&comp); |
752 | req->data[0] = PMU_I2C_CMD; | 752 | req->data[0] = PMU_I2C_CMD; |
753 | req->reply[0] = 0xff; | 753 | req->reply[0] = 0xff; |
754 | req->nbytes = 2; | 754 | req->nbytes = 2; |