Commit e41fc7c8 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'sound-5.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "Two small changes have been cherry-picked as a last material for 5.13:
  a coverage after UMN revert action and a stale MAINTAINERS entry fix"

* tag 'sound-5.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  MAINTAINERS: remove Timur Tabi from Freescale SOC sound drivers
  ASoC: rt5645: Avoid upgrading static warnings to errors
parents 44db63d1 5c6d4f97
...@@ -7354,7 +7354,6 @@ F: drivers/net/ethernet/freescale/fs_enet/ ...@@ -7354,7 +7354,6 @@ F: drivers/net/ethernet/freescale/fs_enet/
F: include/linux/fs_enet_pd.h F: include/linux/fs_enet_pd.h
FREESCALE SOC SOUND DRIVERS FREESCALE SOC SOUND DRIVERS
M: Timur Tabi <timur@kernel.org>
M: Nicolin Chen <nicoleotsuka@gmail.com> M: Nicolin Chen <nicoleotsuka@gmail.com>
M: Xiubo Li <Xiubo.Lee@gmail.com> M: Xiubo Li <Xiubo.Lee@gmail.com>
R: Fabio Estevam <festevam@gmail.com> R: Fabio Estevam <festevam@gmail.com>
......
...@@ -3388,44 +3388,30 @@ static int rt5645_probe(struct snd_soc_component *component) ...@@ -3388,44 +3388,30 @@ static int rt5645_probe(struct snd_soc_component *component)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
int ret = 0;
rt5645->component = component; rt5645->component = component;
switch (rt5645->codec_type) { switch (rt5645->codec_type) {
case CODEC_TYPE_RT5645: case CODEC_TYPE_RT5645:
ret = snd_soc_dapm_new_controls(dapm, snd_soc_dapm_new_controls(dapm,
rt5645_specific_dapm_widgets, rt5645_specific_dapm_widgets,
ARRAY_SIZE(rt5645_specific_dapm_widgets)); ARRAY_SIZE(rt5645_specific_dapm_widgets));
if (ret < 0) snd_soc_dapm_add_routes(dapm,
goto exit;
ret = snd_soc_dapm_add_routes(dapm,
rt5645_specific_dapm_routes, rt5645_specific_dapm_routes,
ARRAY_SIZE(rt5645_specific_dapm_routes)); ARRAY_SIZE(rt5645_specific_dapm_routes));
if (ret < 0)
goto exit;
if (rt5645->v_id < 3) { if (rt5645->v_id < 3) {
ret = snd_soc_dapm_add_routes(dapm, snd_soc_dapm_add_routes(dapm,
rt5645_old_dapm_routes, rt5645_old_dapm_routes,
ARRAY_SIZE(rt5645_old_dapm_routes)); ARRAY_SIZE(rt5645_old_dapm_routes));
if (ret < 0)
goto exit;
} }
break; break;
case CODEC_TYPE_RT5650: case CODEC_TYPE_RT5650:
ret = snd_soc_dapm_new_controls(dapm, snd_soc_dapm_new_controls(dapm,
rt5650_specific_dapm_widgets, rt5650_specific_dapm_widgets,
ARRAY_SIZE(rt5650_specific_dapm_widgets)); ARRAY_SIZE(rt5650_specific_dapm_widgets));
if (ret < 0) snd_soc_dapm_add_routes(dapm,
goto exit;
ret = snd_soc_dapm_add_routes(dapm,
rt5650_specific_dapm_routes, rt5650_specific_dapm_routes,
ARRAY_SIZE(rt5650_specific_dapm_routes)); ARRAY_SIZE(rt5650_specific_dapm_routes));
if (ret < 0)
goto exit;
break; break;
} }
...@@ -3433,17 +3419,9 @@ static int rt5645_probe(struct snd_soc_component *component) ...@@ -3433,17 +3419,9 @@ static int rt5645_probe(struct snd_soc_component *component)
/* for JD function */ /* for JD function */
if (rt5645->pdata.jd_mode) { if (rt5645->pdata.jd_mode) {
ret = snd_soc_dapm_force_enable_pin(dapm, "JD Power"); snd_soc_dapm_force_enable_pin(dapm, "JD Power");
if (ret < 0) snd_soc_dapm_force_enable_pin(dapm, "LDO2");
goto exit; snd_soc_dapm_sync(dapm);
ret = snd_soc_dapm_force_enable_pin(dapm, "LDO2");
if (ret < 0)
goto exit;
ret = snd_soc_dapm_sync(dapm);
if (ret < 0)
goto exit;
} }
if (rt5645->pdata.long_name) if (rt5645->pdata.long_name)
...@@ -3454,14 +3432,9 @@ static int rt5645_probe(struct snd_soc_component *component) ...@@ -3454,14 +3432,9 @@ static int rt5645_probe(struct snd_soc_component *component)
GFP_KERNEL); GFP_KERNEL);
if (!rt5645->eq_param) if (!rt5645->eq_param)
ret = -ENOMEM; return -ENOMEM;
exit:
/* return 0;
* If there was an error above, everything will be cleaned up by the
* caller if we return an error here. This will be done with a later
* call to rt5645_remove().
*/
return ret;
} }
static void rt5645_remove(struct snd_soc_component *component) static void rt5645_remove(struct snd_soc_component *component)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment