Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc...

[uclinux-h8/linux.git] / sound / soc / codecs / sta529.c

diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index a40c4b0..9aa1323 100644 (file)
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -197,16 +197,16 @@ static int sta529_hw_params(struct snd_pcm_substream *substream,
        int pdata, play_freq_val, record_freq_val;
        int bclk_to_fs_ratio;
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                pdata = 1;
                bclk_to_fs_ratio = 0;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                pdata = 2;
                bclk_to_fs_ratio = 1;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                pdata = 3;
                bclk_to_fs_ratio = 2;
                break;
@@ -380,10 +380,8 @@ static int sta529_i2c_probe(struct i2c_client *i2c,
                return -EINVAL;
 
        sta529 = devm_kzalloc(&i2c->dev, sizeof(struct sta529), GFP_KERNEL);
-       if (sta529 == NULL) {
-               dev_err(&i2c->dev, "Can not allocate memory\n");
+       if (!sta529)
                return -ENOMEM;
-       }
 
        sta529->regmap = devm_regmap_init_i2c(i2c, &sta529_regmap);
        if (IS_ERR(sta529->regmap)) {