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

Unverified Commit d1c9e44a authored by Saiyam Doshi's avatar Saiyam Doshi Committed by Mark Brown
Browse files

ASoC: wcd9335: remove redundant use of ret variable 



All these functions declares and initializes variable ret with
'0' and without modifying 'ret' variable, it is returned.

This patch removes this redundancy and returns '0' directly.

Signed-off-by: default avatarSaiyam Doshi <saiyamdoshi.in@gmail.com>
Link: https://lore.kernel.org/r/20190909174541.GA22718@SD


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6fa5963c

sound/soc/codecs/wcd9335.c

+8 −16
Original line number Diff line number Diff line
@@ -3022,7 +3022,6 @@ static int wcd9335_codec_enable_slim(struct snd_soc_dapm_widget *w, 
	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct wcd9335_codec *wcd = snd_soc_component_get_drvdata(comp);

	struct wcd_slim_codec_dai_data *dai = &wcd->dai[w->shift];

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:
@@ -3034,7 +3033,7 @@ static int wcd9335_codec_enable_slim(struct snd_soc_dapm_widget *w, 
		break;

	}



	return ret;

	return 0;

}



static int wcd9335_codec_enable_mix_path(struct snd_soc_dapm_widget *w,
@@ -3539,7 +3538,6 @@ static int wcd9335_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int hph_mode = wcd->hph_mode;

	u8 dem_inp;

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3579,7 +3577,7 @@ static int wcd9335_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static int wcd9335_codec_lineout_dac_event(struct snd_soc_dapm_widget *w,
@@ -3607,7 +3605,6 @@ static int wcd9335_codec_ear_dac_event(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3621,7 +3618,7 @@ static int wcd9335_codec_ear_dac_event(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static void wcd9335_codec_hph_post_pa_config(struct wcd9335_codec *wcd,
@@ -3692,7 +3689,6 @@ static int wcd9335_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int hph_mode = wcd->hph_mode;

	u8 dem_inp;

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3731,7 +3727,7 @@ static int wcd9335_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w,
@@ -3741,7 +3737,6 @@ static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int hph_mode = wcd->hph_mode;

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3780,7 +3775,7 @@ static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static int wcd9335_codec_enable_lineout_pa(struct snd_soc_dapm_widget *w,
@@ -3789,7 +3784,6 @@ static int wcd9335_codec_enable_lineout_pa(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	int vol_reg = 0, mix_vol_reg = 0;

	int ret = 0;



	if (w->reg == WCD9335_ANA_LO_1_2) {

		if (w->shift == 7) {
@@ -3837,7 +3831,7 @@ static int wcd9335_codec_enable_lineout_pa(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static void wcd9335_codec_init_flyback(struct snd_soc_component *component)
@@ -3892,7 +3886,6 @@ static int wcd9335_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int hph_mode = wcd->hph_mode;

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3930,14 +3923,13 @@ static int wcd9335_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static int wcd9335_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,

				       struct snd_kcontrol *kc, int event)

{

	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:
@@ -3967,7 +3959,7 @@ static int wcd9335_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static irqreturn_t wcd9335_slimbus_irq(int irq, void *data)