Merge remote-tracking branch 'asoc/topic/warn' into asoc-next

17 files changed, 78 insertions, 57 deletions

diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index 66ceee22fdad..53d7dab4e054 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -568,8 +568,9 @@ static void m98088_eq_band(struct snd_soc_codec *codec, unsigned int dai,
        unsigned int eq_reg;
        unsigned int i;
 
-       BUG_ON(band > 4);
-       BUG_ON(dai > 1);
+        if (WARN_ON(band > 4) ||
+            WARN_ON(dai > 1))
+                return;
 
        /* Load the base register address */
        eq_reg = dai ? M98088_REG_84_DAI2_EQ_BASE : M98088_REG_52_DAI1_EQ_BASE;
@@ -909,7 +910,8 @@ static int max98088_line_pga(struct snd_soc_dapm_widget *w,
        struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
        u8 *state;
 
-       BUG_ON(!((channel == 1) || (channel == 2)));
+        if (WARN_ON(!(channel == 1 || channel == 2)))
+                return -EINVAL;
 
        switch (line) {
        case LINE_INA:
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 8fb072455802..67244315c721 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -516,8 +516,9 @@ static void m98095_eq_band(struct snd_soc_codec *codec, unsigned int dai,
         unsigned int eq_reg;
         unsigned int i;
 
-        BUG_ON(band > 4);
-        BUG_ON(dai > 1);
+        if (WARN_ON(band > 4) ||
+            WARN_ON(dai > 1))
+                return;
 
         /* Load the base register address */
         eq_reg = dai ? M98095_142_DAI2_EQ_BASE : M98095_110_DAI1_EQ_BASE;
@@ -541,8 +542,9 @@ static void m98095_biquad_band(struct snd_soc_codec *codec, unsigned int dai,
         unsigned int bq_reg;
         unsigned int i;
 
-        BUG_ON(band > 1);
-        BUG_ON(dai > 1);
+        if (WARN_ON(band > 1) ||
+            WARN_ON(dai > 1))
+                return;
 
         /* Load the base register address */
         bq_reg = dai ? M98095_17E_DAI2_BQ_BASE : M98095_174_DAI1_BQ_BASE;
@@ -890,7 +892,8 @@ static int max98095_line_pga(struct snd_soc_dapm_widget *w,
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
         u8 *state;
 
-        BUG_ON(!((channel == 1) || (channel == 2)));
+        if (WARN_ON(!(channel == 1 || channel == 2)))
+                return -EINVAL;
 
         state = &max98095->lin_state;
 
@@ -1740,7 +1743,8 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol,
         int fs, best, best_val, i;
         int regmask, regsave;
 
-        BUG_ON(channel > 1);
+        if (WARN_ON(channel > 1))
+                return -EINVAL;
 
         if (!pdata || !max98095->eq_textcnt)
                 return 0;
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 998555f2a8aa..b27c396037d4 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -56,7 +56,8 @@ static int tpa6130a2_i2c_read(int reg)
         struct tpa6130a2_data *data;
         int val;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         /* If powered off, return the cached value */
@@ -78,7 +79,8 @@ static int tpa6130a2_i2c_write(int reg, u8 value)
         struct tpa6130a2_data *data;
         int val = 0;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         if (data->power_state) {
@@ -99,7 +101,8 @@ static u8 tpa6130a2_read(int reg)
 {
         struct tpa6130a2_data *data;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return 0;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         return data->regs[reg];
@@ -110,7 +113,8 @@ static int tpa6130a2_initialize(void)
         struct tpa6130a2_data *data;
         int i, ret = 0;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         for (i = 1; i < TPA6130A2_REG_VERSION; i++) {
@@ -128,7 +132,8 @@ static int tpa6130a2_power(u8 power)
         u8      val;
         int     ret = 0;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         mutex_lock(&data->mutex);
@@ -194,7 +199,8 @@ static int tpa6130a2_get_volsw(struct snd_kcontrol *kcontrol,
         unsigned int mask = (1 << fls(max)) - 1;
         unsigned int invert = mc->invert;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         mutex_lock(&data->mutex);
@@ -224,7 +230,8 @@ static int tpa6130a2_put_volsw(struct snd_kcontrol *kcontrol,
         unsigned int val = (ucontrol->value.integer.value[0] & mask);
         unsigned int val_reg;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         if (invert)
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index d5ebcb00019b..aea916431227 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -372,7 +372,8 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
         offset = 0;
         dsp = inforec->dsp_target;
         wm0010->boot_failed = false;
-        BUG_ON(!list_empty(&xfer_list));
+        if (WARN_ON(!list_empty(&xfer_list)))
+                return -EINVAL;
         init_completion(&done);
 
         /* First record should be INFO */
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index 7fefd766b582..8ae50274ea8f 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -137,7 +137,8 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
         unsigned long rate;
         int ret;
 
-        BUG_ON(wm2000->anc_mode != ANC_OFF);
+        if (WARN_ON(wm2000->anc_mode != ANC_OFF))
+                return -EINVAL;
 
         dev_dbg(&i2c->dev, "Beginning power up\n");
 
@@ -277,7 +278,8 @@ static int wm2000_enter_bypass(struct i2c_client *i2c, int analogue)
 {
         struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
 
-        BUG_ON(wm2000->anc_mode != ANC_ACTIVE);
+        if (WARN_ON(wm2000->anc_mode != ANC_ACTIVE))
+                return -EINVAL;
 
         if (analogue) {
                 wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL,
@@ -315,7 +317,8 @@ static int wm2000_exit_bypass(struct i2c_client *i2c, int analogue)
 {
         struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
 
-        BUG_ON(wm2000->anc_mode != ANC_BYPASS);
+        if (WARN_ON(wm2000->anc_mode != ANC_BYPASS))
+                return -EINVAL;
         
         wm2000_write(i2c, WM2000_REG_SYS_CTL1, 0);
 
@@ -349,7 +352,8 @@ static int wm2000_enter_standby(struct i2c_client *i2c, int analogue)
 {
         struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
 
-        BUG_ON(wm2000->anc_mode != ANC_ACTIVE);
+        if (WARN_ON(wm2000->anc_mode != ANC_ACTIVE))
+                return -EINVAL;
 
         if (analogue) {
                 wm2000_write(i2c, WM2000_REG_ANA_VMID_PD_TIME, 248 / 4);
@@ -392,7 +396,8 @@ static int wm2000_exit_standby(struct i2c_client *i2c, int analogue)
 {
         struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
 
-        BUG_ON(wm2000->anc_mode != ANC_STANDBY);
+        if (WARN_ON(wm2000->anc_mode != ANC_STANDBY))
+                return -EINVAL;
 
         wm2000_write(i2c, WM2000_REG_SYS_CTL1, 0);
 
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index ac1745d030d6..4cf91deabc02 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1972,7 +1972,8 @@ static void wm5100_set_detect_mode(struct wm5100_priv *wm5100, int the_mode)
 {
         struct wm5100_jack_mode *mode = &wm5100->pdata.jack_modes[the_mode];
 
-        BUG_ON(the_mode >= ARRAY_SIZE(wm5100->pdata.jack_modes));
+        if (WARN_ON(the_mode >= ARRAY_SIZE(wm5100->pdata.jack_modes)))
+                return;
 
         gpio_set_value_cansleep(wm5100->pdata.hp_pol, mode->hp_pol);
         regmap_update_bits(wm5100->regmap, WM5100_ACCESSORY_DETECT_MODE_1,
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index af1318ddb062..a183dcf3d5c1 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -274,7 +274,7 @@ static int pga_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid shift %d\n", w->shift);
                 return -1;
         }
 
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 5e9c40fa7eb2..08a414b57b1e 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -736,7 +736,7 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id,
                 break;
 
         default:
-                BUG_ON("Unknown DAI driver ID\n");
+                WARN(1, "Unknown DAI driver ID\n");
                 return -EINVAL;
         }
 
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index f31017ed1381..942d58e455f3 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -325,7 +325,8 @@ static int wm8776_set_sysclk(struct snd_soc_dai *dai,
         struct snd_soc_codec *codec = dai->codec;
         struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec);
 
-        BUG_ON(dai->driver->id >= ARRAY_SIZE(wm8776->sysclk));
+        if (WARN_ON(dai->driver->id >= ARRAY_SIZE(wm8776->sysclk)))
+                return -EINVAL;
 
         wm8776->sysclk[dai->driver->id] = freq;
 
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 7c8257c5a17b..734209e252c3 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -279,7 +279,8 @@ static int wm8900_hp_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
+                break;
         }
 
         return 0;
@@ -691,7 +692,8 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
         unsigned int K, Ndiv, Nmod, target;
         unsigned int div;
 
-        BUG_ON(!Fout);
+        if (WARN_ON(!Fout))
+                return -EINVAL;
 
         /* The FLL must run at 90-100MHz which is then scaled down to
          * the output value by FLLCLK_DIV. */
@@ -742,8 +744,9 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
         /* Move down to proper range now rounding is done */
         fll_div->k = K / 10;
 
-        BUG_ON(target != Fout * (fll_div->fllclk_div << 2));
-        BUG_ON(!K && target != Fref * fll_div->fll_ratio * fll_div->n);
+        if (WARN_ON(target != Fout * (fll_div->fllclk_div << 2)) ||
+            WARN_ON(!K && target != Fref * fll_div->fll_ratio * fll_div->n))
+                return -EINVAL;
 
         return 0;
 }
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 4dfa8dceeabf..3938fb1c203e 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -658,7 +658,8 @@ SOC_SINGLE_TLV("EQ5 Volume", WM8904_EQ6, 0, 24, 0, eq_tlv),
 static int cp_event(struct snd_soc_dapm_widget *w,
                     struct snd_kcontrol *kcontrol, int event)
 {
-        BUG_ON(event != SND_SOC_DAPM_POST_PMU);
+        if (WARN_ON(event != SND_SOC_DAPM_POST_PMU))
+                return -EINVAL;
 
         /* Maximum startup time */
         udelay(500);
@@ -740,7 +741,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
                 dcs_r = 3;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid reg %d\n", reg);
                 return -EINVAL;
         }
 
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index b0710d817a65..b7488f190d2b 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -348,7 +348,7 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start)
                 aif = 1;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid path %d\n", path);
                 return;
         }
 
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 11d80f3b6137..22e42e788649 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -1845,7 +1845,7 @@ static int cp_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 
@@ -1937,7 +1937,7 @@ static int hp_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         
         }
@@ -1966,7 +1966,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
                 reg = WM8962_SPKOUTL_VOLUME;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid shift %d\n", w->shift);
                 return -EINVAL;
         }
 
@@ -1974,7 +1974,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
         case SND_SOC_DAPM_POST_PMU:
                 return snd_soc_write(codec, reg, snd_soc_read(codec, reg));
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 }
@@ -1997,7 +1997,7 @@ static int dsp2_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 46fe83d2b224..d666de03704a 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -608,7 +608,7 @@ static int bg_event(struct snd_soc_dapm_widget *w,
                 wm8996_bg_disable(codec);
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 ret = -EINVAL;
         }
 
@@ -625,7 +625,7 @@ static int cp_event(struct snd_soc_dapm_widget *w,
                 msleep(5);
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 ret = -EINVAL;
         }
 
@@ -646,7 +646,7 @@ static int rmv_short_event(struct snd_soc_dapm_widget *w,
                 wm8996->hpout_pending |= w->shift;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 
@@ -767,7 +767,7 @@ static int dcs_start(struct snd_soc_dapm_widget *w,
                 wm8996->dcs_pending |= 1 << w->shift;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 
@@ -1656,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:
-                BUG();
+                WARN(1, "Invalid dai id %d\n", dai->id);
                 return -EINVAL;
         }
 
@@ -1768,7 +1768,7 @@ static int wm8996_hw_params(struct snd_pcm_substream *substream,
                 dsp_shift = WM8996_DSP2_DIV_SHIFT;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid dai id %d\n", dai->id);
                 return -EINVAL;
         }
 
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index a53e175c015a..acea8927905b 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -221,7 +221,8 @@ static int wm9713_voice_shutdown(struct snd_soc_dapm_widget *w,
         struct snd_soc_codec *codec = w->codec;
         u16 status, rate;
 
-        BUG_ON(event != SND_SOC_DAPM_PRE_PMD);
+        if (WARN_ON(event != SND_SOC_DAPM_PRE_PMD))
+                return -EINVAL;
 
         /* Gracefully shut down the voice interface. */
         status = ac97_read(codec, AC97_EXTENDED_MID) | 0x1000;
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index df95e5a83889..46ec0e9744d4 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -341,6 +341,8 @@ static struct wm_adsp_region const *wm_adsp_find_region(struct wm_adsp *dsp,
 static unsigned int wm_adsp_region_to_reg(struct wm_adsp_region const *region,
                                           unsigned int offset)
 {
+        if (WARN_ON(!region))
+                return offset;
         switch (region->type) {
         case WMFW_ADSP1_PM:
                 return region->base + (offset * 3);
@@ -353,7 +355,7 @@ static unsigned int wm_adsp_region_to_reg(struct wm_adsp_region const *region,
         case WMFW_ADSP1_ZM:
                 return region->base + (offset * 2);
         default:
-                WARN_ON(NULL != "Unknown memory region type");
+                WARN(1, "Unknown memory region type");
                 return offset;
         }
 }
@@ -605,7 +607,7 @@ static int wm_adsp_load(struct wm_adsp *dsp)
                 break;
 
         default:
-                BUG_ON(NULL == "Unknown DSP type");
+                WARN(1, "Unknown DSP type");
                 goto out_fw;
         }
 
@@ -645,27 +647,22 @@ static int wm_adsp_load(struct wm_adsp *dsp)
                         reg = offset;
                         break;
                 case WMFW_ADSP1_PM:
-                        BUG_ON(!mem);
                         region_name = "PM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
                 case WMFW_ADSP1_DM:
-                        BUG_ON(!mem);
                         region_name = "DM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
                 case WMFW_ADSP2_XM:
-                        BUG_ON(!mem);
                         region_name = "XM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
                 case WMFW_ADSP2_YM:
-                        BUG_ON(!mem);
                         region_name = "YM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
                 case WMFW_ADSP1_ZM:
-                        BUG_ON(!mem);
                         region_name = "ZM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
@@ -905,10 +902,8 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                 break;
         }
 
-        if (mem == NULL) {
-                BUG_ON(mem != NULL);
+        if (WARN_ON(!mem))
                 return -EINVAL;
-        }
 
         switch (dsp->type) {
         case WMFW_ADSP1:
@@ -1002,7 +997,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                 break;
 
         default:
-                BUG_ON(NULL == "Unknown DSP type");
+                WARN(1, "Unknown DSP type");
                 return -EINVAL;
         }
 
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 01daf655e20b..b371066dd5bc 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -611,7 +611,7 @@ static int earpiece_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 break;
         }