aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ling <scott.ling@wolfsonmicro.com>2012-11-05 09:44:25 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-06 03:19:15 -0500
commitf9baa0ccb2500be60c51aec6d1f3988dec0df3fe (patch)
tree34eb74bf577b51dfcdf38b02b84d36c2785b2684
parent6f0c0580b70c89094b3422ba81118c7b959c7556 (diff)
ASoC: wm0010: Remove boot_done variable as no longer required.
Remove the boot_done counter variable and check the wm0010 state variable instead. Signed-off-by: Scott Ling <scott.ling@wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm0010.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 99afc003a084..5c1291748326 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -97,7 +97,6 @@ struct wm0010_priv {
97 97
98 enum wm0010_state state; 98 enum wm0010_state state;
99 bool boot_failed; 99 bool boot_failed;
100 int boot_done;
101 bool ready; 100 bool ready;
102 bool pll_running; 101 bool pll_running;
103 int max_spi_freq; 102 int max_spi_freq;
@@ -234,7 +233,7 @@ static void wm0010_boot_xfer_complete(void *data)
234 break; 233 break;
235 234
236 case 0x55555555: 235 case 0x55555555:
237 if (wm0010->boot_done == 0) 236 if (wm0010->state < WM0010_STAGE2)
238 break; 237 break;
239 dev_err(codec->dev, 238 dev_err(codec->dev,
240 "%d: ROM bootloader running in stage 2\n", i); 239 "%d: ROM bootloader running in stage 2\n", i);
@@ -321,7 +320,6 @@ static void wm0010_boot_xfer_complete(void *data)
321 break; 320 break;
322 } 321 }
323 322
324 wm0010->boot_done++;
325 if (xfer->done) 323 if (xfer->done)
326 complete(xfer->done); 324 complete(xfer->done);
327} 325}
@@ -544,7 +542,6 @@ static int wm0010_boot(struct snd_soc_codec *codec)
544 542
545 rec = (const struct dfw_binrec *)fw->data; 543 rec = (const struct dfw_binrec *)fw->data;
546 offset = 0; 544 offset = 0;
547 wm0010->boot_done = 0;
548 wm0010->boot_failed = false; 545 wm0010->boot_failed = false;
549 BUG_ON(!list_empty(&xfer_list)); 546 BUG_ON(!list_empty(&xfer_list));
550 init_completion(&done); 547 init_completion(&done);