summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8996.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8996.c')
-rw-r--r--sound/soc/codecs/wm8996.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 1a7655b..46fe83d 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -438,8 +438,6 @@ static int wm8996_get_retune_mobile_enum(struct snd_kcontrol *kcontrol,
struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
int block = wm8996_get_retune_mobile_block(kcontrol->id.name);
- if (block < 0)
- return block;
ucontrol->value.enumerated.item[0] = wm8996->retune_mobile_cfg[block];
return 0;
@@ -610,7 +608,7 @@ static int bg_event(struct snd_soc_dapm_widget *w,
wm8996_bg_disable(codec);
break;
default:
- WARN(1, "Invalid event %d\n", event);
+ BUG();
ret = -EINVAL;
}
@@ -627,7 +625,7 @@ static int cp_event(struct snd_soc_dapm_widget *w,
msleep(5);
break;
default:
- WARN(1, "Invalid event %d\n", event);
+ BUG();
ret = -EINVAL;
}
@@ -648,7 +646,7 @@ static int rmv_short_event(struct snd_soc_dapm_widget *w,
wm8996->hpout_pending |= w->shift;
break;
default:
- WARN(1, "Invalid event %d\n", event);
+ BUG();
return -EINVAL;
}
@@ -769,7 +767,7 @@ static int dcs_start(struct snd_soc_dapm_widget *w,
wm8996->dcs_pending |= 1 << w->shift;
break;
default:
- WARN(1, "Invalid event %d\n", event);
+ BUG();
return -EINVAL;
}
@@ -1658,7 +1656,7 @@ static int wm8996_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
lrclk_rx_reg = WM8996_AIF2_RX_LRCLK_2;
break;
default:
- WARN(1, "Invalid dai id %d\n", dai->id);
+ BUG();
return -EINVAL;
}
@@ -1770,7 +1768,7 @@ static int wm8996_hw_params(struct snd_pcm_substream *substream,
dsp_shift = WM8996_DSP2_DIV_SHIFT;
break;
default:
- WARN(1, "Invalid dai id %d\n", dai->id);
+ BUG();
return -EINVAL;
}