summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm0010.c
diff options
context:
space:
mode:
authorScott Ling <scott.ling@wolfsonmicro.com>2012-11-05 14:44:25 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-06 09:19:15 +0100
commitf9baa0ccb2500be60c51aec6d1f3988dec0df3fe (patch)
tree34eb74bf577b51dfcdf38b02b84d36c2785b2684 /sound/soc/codecs/wm0010.c
parent6f0c0580b70c89094b3422ba81118c7b959c7556 (diff)
downloadop-kernel-dev-f9baa0ccb2500be60c51aec6d1f3988dec0df3fe.zip
op-kernel-dev-f9baa0ccb2500be60c51aec6d1f3988dec0df3fe.tar.gz
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.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 99afc00..5c12917 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);
OpenPOWER on IntegriCloud