Commit e41fc7c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7354,7 +7354,6 @@ F: drivers/net/ethernet/freescale/fs_enet/ 
F:	include/linux/fs_enet_pd.h









FREESCALE SOC SOUND DRIVERS









M:	Timur Tabi <timur@kernel.org>









M:	Nicolin Chen <nicoleotsuka@gmail.com>









M:	Xiubo Li <Xiubo.Lee@gmail.com>









R:	Fabio Estevam <festevam@gmail.com>
































sound/soc/codecs/rt5645.c



+11
−38






























Original line number
Diff line number
Diff line







@@ -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 rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);









	int ret = 0;



















	rt5645->component = component;



















	switch (rt5645->codec_type) {









	case CODEC_TYPE_RT5645:









		ret = snd_soc_dapm_new_controls(dapm,









		snd_soc_dapm_new_controls(dapm,









			rt5645_specific_dapm_widgets,









			ARRAY_SIZE(rt5645_specific_dapm_widgets));









		if (ret < 0)









			goto exit;



















		ret = snd_soc_dapm_add_routes(dapm,









		snd_soc_dapm_add_routes(dapm,









			rt5645_specific_dapm_routes,









			ARRAY_SIZE(rt5645_specific_dapm_routes));









		if (ret < 0)









			goto exit;



















		if (rt5645->v_id < 3) {









			ret = snd_soc_dapm_add_routes(dapm,









			snd_soc_dapm_add_routes(dapm,









				rt5645_old_dapm_routes,









				ARRAY_SIZE(rt5645_old_dapm_routes));









			if (ret < 0)









				goto exit;









		}









		break;









	case CODEC_TYPE_RT5650:









		ret = snd_soc_dapm_new_controls(dapm,









		snd_soc_dapm_new_controls(dapm,









			rt5650_specific_dapm_widgets,









			ARRAY_SIZE(rt5650_specific_dapm_widgets));









		if (ret < 0)









			goto exit;



















		ret = snd_soc_dapm_add_routes(dapm,









		snd_soc_dapm_add_routes(dapm,









			rt5650_specific_dapm_routes,









			ARRAY_SIZE(rt5650_specific_dapm_routes));









		if (ret < 0)









			goto exit;









		break;









	}


















@@ -3433,17 +3419,9 @@ static int rt5645_probe(struct snd_soc_component *component)

















	/* for JD function */









	if (rt5645->pdata.jd_mode) {









		ret = snd_soc_dapm_force_enable_pin(dapm, "JD Power");









		if (ret < 0)









			goto exit;



















		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;









		snd_soc_dapm_force_enable_pin(dapm, "JD Power");









		snd_soc_dapm_force_enable_pin(dapm, "LDO2");









		snd_soc_dapm_sync(dapm);









	}



















	if (rt5645->pdata.long_name)








@@ -3454,14 +3432,9 @@ static int rt5645_probe(struct snd_soc_component *component)







		GFP_KERNEL);



















	if (!rt5645->eq_param)









		ret = -ENOMEM;









exit:









	/*









	 * 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;









		return -ENOMEM;



















	return 0;









}



















static void rt5645_remove(struct snd_soc_component *component)