提交 7d00cd97 编写于 作者: C Charles Keepax 提交者: Mark Brown

ASoC: wm_adsp: Fixup some odd line wrapping

Signed-off-by: NCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 cc815c4b
master alk-4.19.24 alk-4.19.30 alk-4.19.34 alk-4.19.36 alk-4.19.43 alk-4.19.48 alk-4.19.57 ck-4.19.67 ck-4.19.81 ck-4.19.91 github/fork/deepanshu1422/fix-typo-in-comment github/fork/haosdent/fix-typo linux-next v4.19.91 v4.19.90 v4.19.89 v4.19.88 v4.19.87 v4.19.86 v4.19.85 v4.19.84 v4.19.83 v4.19.82 v4.19.81 v4.19.80 v4.19.79 v4.19.78 v4.19.77 v4.19.76 v4.19.75 v4.19.74 v4.19.73 v4.19.72 v4.19.71 v4.19.70 v4.19.69 v4.19.68 v4.19.67 v4.19.66 v4.19.65 v4.19.64 v4.19.63 v4.19.62 v4.19.61 v4.19.60 v4.19.59 v4.19.58 v4.19.57 v4.19.56 v4.19.55 v4.19.54 v4.19.53 v4.19.52 v4.19.51 v4.19.50 v4.19.49 v4.19.48 v4.19.47 v4.19.46 v4.19.45 v4.19.44 v4.19.43 v4.19.42 v4.19.41 v4.19.40 v4.19.39 v4.19.38 v4.19.37 v4.19.36 v4.19.35 v4.19.34 v4.19.33 v4.19.32 v4.19.31 v4.19.30 v4.19.29 v4.19.28 v4.19.27 v4.19.26 v4.19.25 v4.19.24 v4.19.23 v4.19.22 v4.19.21 v4.19.20 v4.19.19 v4.19.18 v4.19.17 v4.19.16 v4.19.15 v4.19.14 v4.19.13 v4.19.12 v4.19.11 v4.19.10 v4.19.9 v4.19.8 v4.19.7 v4.19.6 v4.19.5 v4.19.4 v4.19.3 v4.19.2 v4.19.1 v4.19 v4.19-rc8 v4.19-rc7 v4.19-rc6 v4.19-rc5 v4.19-rc4 v4.19-rc3 v4.19-rc2 v4.19-rc1 ck-release-21 ck-release-20 ck-release-19.2 ck-release-19.1 ck-release-19 ck-release-18 ck-release-17.2 ck-release-17.1 ck-release-17 ck-release-16 ck-release-15.1 ck-release-15 ck-release-14 ck-release-13.2 ck-release-13 ck-release-12 ck-release-11 ck-release-10 ck-release-9 ck-release-7 alk-release-15 alk-release-14 alk-release-13.2 alk-release-13 alk-release-12 alk-release-11 alk-release-10 alk-release-9 alk-release-7
无相关合并请求
...@@ -862,15 +862,13 @@ static int wmfw_add_ctl(struct wm_adsp *dsp, struct wm_coeff_ctl *ctl) ...@@ -862,15 +862,13 @@ static int wmfw_add_ctl(struct wm_adsp *dsp, struct wm_coeff_ctl *ctl)
kcontrol->access |= SNDRV_CTL_ELEM_ACCESS_VOLATILE; kcontrol->access |= SNDRV_CTL_ELEM_ACCESS_VOLATILE;
} }
ret = snd_soc_add_card_controls(dsp->card, ret = snd_soc_add_card_controls(dsp->card, kcontrol, 1);
kcontrol, 1);
if (ret < 0) if (ret < 0)
goto err_kcontrol; goto err_kcontrol;
kfree(kcontrol); kfree(kcontrol);
ctl->kcontrol = snd_soc_card_get_kcontrol(dsp->card, ctl->kcontrol = snd_soc_card_get_kcontrol(dsp->card, ctl->name);
ctl->name);
return 0; return 0;
...@@ -890,9 +888,7 @@ static int wm_coeff_init_control_caches(struct wm_adsp *dsp) ...@@ -890,9 +888,7 @@ static int wm_coeff_init_control_caches(struct wm_adsp *dsp)
if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) if (ctl->flags & WMFW_CTL_FLAG_VOLATILE)
continue; continue;
ret = wm_coeff_read_control(ctl, ret = wm_coeff_read_control(ctl, ctl->cache, ctl->len);
ctl->cache,
ctl->len);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
...@@ -909,9 +905,7 @@ static int wm_coeff_sync_controls(struct wm_adsp *dsp) ...@@ -909,9 +905,7 @@ static int wm_coeff_sync_controls(struct wm_adsp *dsp)
if (!ctl->enabled) if (!ctl->enabled)
continue; continue;
if (ctl->set && !(ctl->flags & WMFW_CTL_FLAG_VOLATILE)) { if (ctl->set && !(ctl->flags & WMFW_CTL_FLAG_VOLATILE)) {
ret = wm_coeff_write_control(ctl, ret = wm_coeff_write_control(ctl, ctl->cache, ctl->len);
ctl->cache,
ctl->len);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
...@@ -1507,8 +1501,7 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs, ...@@ -1507,8 +1501,7 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs,
ret = regmap_raw_read(dsp->regmap, pos, alg, len * 2); ret = regmap_raw_read(dsp->regmap, pos, alg, len * 2);
if (ret != 0) { if (ret != 0) {
adsp_err(dsp, "Failed to read algorithm list: %d\n", adsp_err(dsp, "Failed to read algorithm list: %d\n", ret);
ret);
kfree(alg); kfree(alg);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
...@@ -2007,8 +2000,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, ...@@ -2007,8 +2000,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
goto err_mutex; goto err_mutex;
} }
val = (val & dsp->sysclk_mask) val = (val & dsp->sysclk_mask) >> dsp->sysclk_shift;
>> dsp->sysclk_shift;
ret = regmap_update_bits(dsp->regmap, ret = regmap_update_bits(dsp->regmap,
dsp->base + ADSP1_CONTROL_31, dsp->base + ADSP1_CONTROL_31,
...@@ -2101,8 +2093,7 @@ static int wm_adsp2_ena(struct wm_adsp *dsp) ...@@ -2101,8 +2093,7 @@ static int wm_adsp2_ena(struct wm_adsp *dsp)
/* Wait for the RAM to start, should be near instantaneous */ /* Wait for the RAM to start, should be near instantaneous */
for (count = 0; count < 10; ++count) { for (count = 0; count < 10; ++count) {
ret = regmap_read(dsp->regmap, dsp->base + ADSP2_STATUS1, ret = regmap_read(dsp->regmap, dsp->base + ADSP2_STATUS1, &val);
&val);
if (ret != 0) if (ret != 0)
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部