evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: wsa881x: remove retry logic in swr_startup"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-01 02:22:56 -08:00 • committed by Gerrit - the friendly Code Review server
commit c7f26ebc66
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sound/soc/codecs/wsa881x.c
View file

@ -1094,7 +1094,6 @@ static int wsa881x_swr_startup(struct swr_device *swr_dev)
{ {
int ret = 0; int ret = 0;
u8 devnum = 0; u8 devnum = 0;
u8 retry = WSA881X_NUM_RETRY;
struct wsa881x_priv *wsa881x; struct wsa881x_priv *wsa881x;
wsa881x = swr_get_dev_data(swr_dev); wsa881x = swr_get_dev_data(swr_dev);
@ -1109,16 +1108,12 @@ static int wsa881x_swr_startup(struct swr_device *swr_dev)
* as per HW requirement. * as per HW requirement.
*/ */
usleep_range(5000, 5010); usleep_range(5000, 5010);
while (swr_get_logical_dev_num(swr_dev, swr_dev->addr, &devnum) && ret = swr_get_logical_dev_num(swr_dev, swr_dev->addr, &devnum);
retry--) { if (ret) {
/* Retry after 1 msec delay */ dev_dbg(&swr_dev->dev,
usleep_range(1000, 1100);
}
if (retry == 0) {
dev_err(&swr_dev->dev,
"%s get devnum %d for dev addr %lx failed\n", "%s get devnum %d for dev addr %lx failed\n",
__func__, devnum, swr_dev->addr); __func__, devnum, swr_dev->addr);
return -EINVAL; goto err;
} }
swr_dev->dev_num = devnum; swr_dev->dev_num = devnum;