Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic...

[karo-tx-linux.git] / sound / soc / codecs / da7210.c

diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 9c12314565024fcb80d5091a6fc57a6dddf0555b..e62e294a8033a02ed4e7a90c6c9b41317df79d18 100644 (file)
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -778,17 +778,17 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
 
        dai_cfg1 = 0xFC & snd_soc_read(codec, DA7210_DAI_CFG1);
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                dai_cfg1 |= DA7210_DAI_WORD_S16_LE;
                break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
+       case 20:
                dai_cfg1 |= DA7210_DAI_WORD_S20_3LE;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                dai_cfg1 |= DA7210_DAI_WORD_S24_LE;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                dai_cfg1 |= DA7210_DAI_WORD_S32_LE;
                break;
        default:
@@ -1188,7 +1188,7 @@ static struct snd_soc_codec_driver soc_codec_dev_da7210 = {
        .num_dapm_routes        = ARRAY_SIZE(da7210_audio_map),
 };
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 
 static struct reg_default da7210_regmap_i2c_patch[] = {
 
@@ -1362,7 +1362,7 @@ static struct spi_driver da7210_spi_driver = {
 static int __init da7210_modinit(void)
 {
        int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
        ret = i2c_add_driver(&da7210_i2c_driver);
 #endif
 #if defined(CONFIG_SPI_MASTER)
@@ -1378,7 +1378,7 @@ module_init(da7210_modinit);
 
 static void __exit da7210_exit(void)
 {
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
        i2c_del_driver(&da7210_i2c_driver);
 #endif
 #if defined(CONFIG_SPI_MASTER)