Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca482c07 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ASoC: codecs: Fix function prototype for component remove"" into msm-4.8

parents 1797c30a e0b20e1c

sound/soc/codecs/wcd9330.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -8969,7 +8969,7 @@ static int tomtom_codec_probe(struct snd_soc_component *component) 
	devm_kfree(codec->dev, tomtom);

	devm_kfree(codec->dev, tomtom);

	return ret;

	return ret;

}

}

static void tomtom_codec_remove(struct snd_soc_component *component)

static int tomtom_codec_remove(struct snd_soc_component *component)

{

{

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct tomtom_priv *tomtom = snd_soc_codec_get_drvdata(codec);

	struct tomtom_priv *tomtom = snd_soc_codec_get_drvdata(codec);
@@ -8997,6 +8997,7 @@ static void tomtom_codec_remove(struct snd_soc_component *component) 
	tomtom->spkdrv2_reg = NULL;

	tomtom->spkdrv2_reg = NULL;





	devm_kfree(codec->dev, tomtom);

	devm_kfree(codec->dev, tomtom);

	return 0;

}

}





static struct regmap *tomtom_get_regmap(struct device *dev)

static struct regmap *tomtom_get_regmap(struct device *dev)

sound/soc/codecs/wcd9335.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -13740,7 +13740,7 @@ static int tasha_codec_probe(struct snd_soc_component *component) 
	return ret;

	return ret;

}

}





static void tasha_codec_remove(struct snd_soc_component *component)

static int tasha_codec_remove(struct snd_soc_component *component)

{

{

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct tasha_priv *tasha = snd_soc_codec_get_drvdata(codec);

	struct tasha_priv *tasha = snd_soc_codec_get_drvdata(codec);
@@ -13753,6 +13753,8 @@ static void tasha_codec_remove(struct snd_soc_component *component) 
	tasha_cleanup_irqs(tasha);

	tasha_cleanup_irqs(tasha);

	/* Cleanup MBHC */

	/* Cleanup MBHC */

	/* Cleanup resmgr */

	/* Cleanup resmgr */



	return 0;

}

}





static struct regmap *tasha_get_regmap(struct device *dev)

static struct regmap *tasha_get_regmap(struct device *dev)

sound/soc/codecs/wcd934x/wcd934x.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -9026,7 +9026,7 @@ static int tavil_soc_codec_probe(struct snd_soc_component *component) 
	return ret;

	return ret;

}

}





static void tavil_soc_codec_remove(struct snd_soc_component *component)

static int tavil_soc_codec_remove(struct snd_soc_component *component)

{

{

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct wcd9xxx *control;

	struct wcd9xxx *control;
@@ -9044,6 +9044,8 @@ static void tavil_soc_codec_remove(struct snd_soc_component *component) 
	/* Deinitialize MBHC module */

	/* Deinitialize MBHC module */

	tavil_mbhc_deinit(codec);

	tavil_mbhc_deinit(codec);

	tavil->mbhc = NULL;

	tavil->mbhc = NULL;



	return 0;

}

}





static struct regmap *tavil_get_regmap(struct device *dev)

static struct regmap *tavil_get_regmap(struct device *dev)

sound/soc/codecs/wsa881x-analog.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1074,7 +1074,7 @@ static int wsa881x_probe(struct snd_soc_component *component) 
	return 0;

	return 0;

}

}





static void wsa881x_remove(struct snd_soc_component *component)

static int wsa881x_remove(struct snd_soc_component *component)

{

{

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct wsa881x_pdata *wsa881x = snd_soc_codec_get_drvdata(codec);

	struct wsa881x_pdata *wsa881x = snd_soc_codec_get_drvdata(codec);
@@ -1084,6 +1084,7 @@ static void wsa881x_remove(struct snd_soc_component *component) 




	mutex_destroy(&wsa881x->bg_lock);

	mutex_destroy(&wsa881x->bg_lock);

	mutex_destroy(&wsa881x->res_lock);

	mutex_destroy(&wsa881x->res_lock);

	return 0;

}

}





static struct snd_soc_codec_driver soc_codec_dev_wsa881x = {

static struct snd_soc_codec_driver soc_codec_dev_wsa881x = {

sound/soc/codecs/wsa881x.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1053,7 +1053,7 @@ static int wsa881x_probe(struct snd_soc_component *component) 
	return 0;

	return 0;

}

}





static void wsa881x_remove(struct snd_soc_component *component)

static int wsa881x_remove(struct snd_soc_component *component)

{

{

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

	struct wsa881x_priv *wsa881x = snd_soc_codec_get_drvdata(codec);

	struct wsa881x_priv *wsa881x = snd_soc_codec_get_drvdata(codec);
@@ -1062,6 +1062,8 @@ static void wsa881x_remove(struct snd_soc_component *component) 
		wsa881x_deinit_thermal(wsa881x->tz_pdata.tz_dev);

		wsa881x_deinit_thermal(wsa881x->tz_pdata.tz_dev);

	mutex_destroy(&wsa881x->bg_lock);

	mutex_destroy(&wsa881x->bg_lock);

	mutex_destroy(&wsa881x->res_lock);

	mutex_destroy(&wsa881x->res_lock);



	return 0;

}

}





static struct regmap *wsa881x_get_regmap(struct device *dev)

static struct regmap *wsa881x_get_regmap(struct device *dev)