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 /sound | |
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 'sound')
-rw-r--r-- | sound/firewire/dice.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/ac97.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c index 6feee6614193..57bcd31fcc12 100644 --- a/sound/firewire/dice.c +++ b/sound/firewire/dice.c | |||
@@ -543,7 +543,7 @@ static int dice_change_rate(struct dice *dice, unsigned int clock_rate) | |||
543 | __be32 value; | 543 | __be32 value; |
544 | int err; | 544 | int err; |
545 | 545 | ||
546 | INIT_COMPLETION(dice->clock_accepted); | 546 | reinit_completion(&dice->clock_accepted); |
547 | 547 | ||
548 | value = cpu_to_be32(clock_rate | CLOCK_SOURCE_ARX1); | 548 | value = cpu_to_be32(clock_rate | CLOCK_SOURCE_ARX1); |
549 | err = snd_fw_transaction(dice->unit, TCODE_WRITE_QUADLET_REQUEST, | 549 | err = snd_fw_transaction(dice->unit, TCODE_WRITE_QUADLET_REQUEST, |
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 2acf987844e8..350ba23a9893 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c | |||
@@ -74,7 +74,7 @@ static void s3c_ac97_activate(struct snd_ac97 *ac97) | |||
74 | if (stat == S3C_AC97_GLBSTAT_MAINSTATE_ACTIVE) | 74 | if (stat == S3C_AC97_GLBSTAT_MAINSTATE_ACTIVE) |
75 | return; /* Return if already active */ | 75 | return; /* Return if already active */ |
76 | 76 | ||
77 | INIT_COMPLETION(s3c_ac97.done); | 77 | reinit_completion(&s3c_ac97.done); |
78 | 78 | ||
79 | ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL); | 79 | ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL); |
80 | ac_glbctrl = S3C_AC97_GLBCTRL_ACLINKON; | 80 | ac_glbctrl = S3C_AC97_GLBCTRL_ACLINKON; |
@@ -103,7 +103,7 @@ static unsigned short s3c_ac97_read(struct snd_ac97 *ac97, | |||
103 | 103 | ||
104 | s3c_ac97_activate(ac97); | 104 | s3c_ac97_activate(ac97); |
105 | 105 | ||
106 | INIT_COMPLETION(s3c_ac97.done); | 106 | reinit_completion(&s3c_ac97.done); |
107 | 107 | ||
108 | ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD); | 108 | ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD); |
109 | ac_codec_cmd = S3C_AC97_CODEC_CMD_READ | AC_CMD_ADDR(reg); | 109 | ac_codec_cmd = S3C_AC97_CODEC_CMD_READ | AC_CMD_ADDR(reg); |
@@ -140,7 +140,7 @@ static void s3c_ac97_write(struct snd_ac97 *ac97, unsigned short reg, | |||
140 | 140 | ||
141 | s3c_ac97_activate(ac97); | 141 | s3c_ac97_activate(ac97); |
142 | 142 | ||
143 | INIT_COMPLETION(s3c_ac97.done); | 143 | reinit_completion(&s3c_ac97.done); |
144 | 144 | ||
145 | ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD); | 145 | ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD); |
146 | ac_codec_cmd = AC_CMD_ADDR(reg) | AC_CMD_DATA(val); | 146 | ac_codec_cmd = AC_CMD_ADDR(reg) | AC_CMD_DATA(val); |