1 files changed, 16 insertions, 15 deletions

diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index 1d9b117345a3..6ea662db2410 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -450,16 +450,16 @@ static int aic32x4_hw_params(struct snd_pcm_substream *substream,
 
         data = snd_soc_read(codec, AIC32X4_IFACE1);
         data = data & ~(3 << 4);
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S16_LE:
+        switch (params_width(params)) {
+        case 16:
                 break;
-        case SNDRV_PCM_FORMAT_S20_3LE:
+        case 20:
                 data |= (AIC32X4_WORD_LEN_20BITS << AIC32X4_DOSRMSB_SHIFT);
                 break;
-        case SNDRV_PCM_FORMAT_S24_LE:
+        case 24:
                 data |= (AIC32X4_WORD_LEN_24BITS << AIC32X4_DOSRMSB_SHIFT);
                 break;
-        case SNDRV_PCM_FORMAT_S32_LE:
+        case 32:
                 data |= (AIC32X4_WORD_LEN_32BITS << AIC32X4_DOSRMSB_SHIFT);
                 break;
         }
@@ -626,32 +626,33 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
                 snd_soc_write(codec, AIC32X4_MICBIAS, AIC32X4_MICBIAS_LDOIN |
                                                       AIC32X4_MICBIAS_2075V);
         }
-        if (aic32x4->power_cfg & AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE) {
+        if (aic32x4->power_cfg & AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE)
                 snd_soc_write(codec, AIC32X4_PWRCFG, AIC32X4_AVDDWEAKDISABLE);
-        }
 
         tmp_reg = (aic32x4->power_cfg & AIC32X4_PWR_AIC32X4_LDO_ENABLE) ?
                         AIC32X4_LDOCTLEN : 0;
         snd_soc_write(codec, AIC32X4_LDOCTL, tmp_reg);
 
         tmp_reg = snd_soc_read(codec, AIC32X4_CMMODE);
-        if (aic32x4->power_cfg & AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36) {
+        if (aic32x4->power_cfg & AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36)
                 tmp_reg |= AIC32X4_LDOIN_18_36;
-        }
-        if (aic32x4->power_cfg & AIC32X4_PWR_CMMODE_HP_LDOIN_POWERED) {
+        if (aic32x4->power_cfg & AIC32X4_PWR_CMMODE_HP_LDOIN_POWERED)
                 tmp_reg |= AIC32X4_LDOIN2HP;
-        }
         snd_soc_write(codec, AIC32X4_CMMODE, tmp_reg);
 
         /* Mic PGA routing */
         if (aic32x4->micpga_routing & AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K)
-                snd_soc_write(codec, AIC32X4_LMICPGANIN, AIC32X4_LMICPGANIN_IN2R_10K);
+                snd_soc_write(codec, AIC32X4_LMICPGANIN,
+                                AIC32X4_LMICPGANIN_IN2R_10K);
         else
-                snd_soc_write(codec, AIC32X4_LMICPGANIN, AIC32X4_LMICPGANIN_CM1L_10K);
+                snd_soc_write(codec, AIC32X4_LMICPGANIN,
+                                AIC32X4_LMICPGANIN_CM1L_10K);
         if (aic32x4->micpga_routing & AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K)
-                snd_soc_write(codec, AIC32X4_RMICPGANIN, AIC32X4_RMICPGANIN_IN1L_10K);
+                snd_soc_write(codec, AIC32X4_RMICPGANIN,
+                                AIC32X4_RMICPGANIN_IN1L_10K);
         else
-                snd_soc_write(codec, AIC32X4_RMICPGANIN, AIC32X4_RMICPGANIN_CM1R_10K);
+                snd_soc_write(codec, AIC32X4_RMICPGANIN,
+                                AIC32X4_RMICPGANIN_CM1R_10K);
 
         aic32x4_set_bias_level(codec, SND_SOC_BIAS_STANDBY);