diff options
| author | Scott Ling <scott.ling@wolfsonmicro.com> | 2012-11-05 15:44:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 09:19:15 +0100 |
| commit | f9baa0ccb2500be60c51aec6d1f3988dec0df3fe (patch) | |
| tree | 34eb74bf577b51dfcdf38b02b84d36c2785b2684 /sound/soc/codecs/wm0010.c | |
| parent | Linux 3.7-rc2 (diff) | |
| download | linux-f9baa0ccb2500be60c51aec6d1f3988dec0df3fe.tar.xz linux-f9baa0ccb2500be60c51aec6d1f3988dec0df3fe.zip | |
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>
Diffstat (limited to 'sound/soc/codecs/wm0010.c')
| -rw-r--r-- | sound/soc/codecs/wm0010.c | 5 |
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 { enum wm0010_state state; bool boot_failed; - int boot_done; bool ready; bool pll_running; int max_spi_freq; @@ -234,7 +233,7 @@ static void wm0010_boot_xfer_complete(void *data) break; case 0x55555555: - if (wm0010->boot_done == 0) + if (wm0010->state < WM0010_STAGE2) break; dev_err(codec->dev, "%d: ROM bootloader running in stage 2\n", i); @@ -321,7 +320,6 @@ static void wm0010_boot_xfer_complete(void *data) break; } - wm0010->boot_done++; if (xfer->done) complete(xfer->done); } @@ -544,7 +542,6 @@ static int wm0010_boot(struct snd_soc_codec *codec) rec = (const struct dfw_binrec *)fw->data; offset = 0; - wm0010->boot_done = 0; wm0010->boot_failed = false; BUG_ON(!list_empty(&xfer_list)); init_completion(&done); |