Skip to content

Commit

Permalink
ASoC: wcd9335: remove redundant use of ret variable
Browse files Browse the repository at this point in the history 
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: Saiyam Doshi <[email protected]>
Link: https://lore.kernel.org/r/20190909174541.GA22718@SD
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
@saiyamd @broonie
saiyamd authored and broonie committed Sep 11, 2019
1 parent 6fa5963 commit d1c9e44
Showing 1 changed file with 8 additions and 16 deletions.
24 changes: 8 additions & 16 deletions sound/soc/codecs/wcd9335.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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,
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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:
Expand All @@ -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,
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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,
Expand All @@ -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:
Expand Down Expand Up @@ -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,
Expand All @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit d1c9e44

Please sign in to comment.