ASoC: soc-io: Use IS_ENABLED() macro
authorFabio Estevam <fabio.estevam@freescale.com>
Wed, 20 Nov 2013 17:37:42 +0000 (15:37 -0200)
committerMark Brown <broonie@linaro.org>
Wed, 27 Nov 2013 16:45:38 +0000 (16:45 +0000)
Using the IS_ENABLED() macro can make the code shorter and simpler.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/soc-io.c

index 4f11d23f20621971b8806e70618ee8e4e1c3846f..aa886cca3ecf94a8ecf2c360312cd3dc3bcb4184 100644 (file)
@@ -99,14 +99,14 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
        config.val_bits = data_bits;
 
        switch (control) {
-#if defined(CONFIG_REGMAP_I2C) || defined(CONFIG_REGMAP_I2C_MODULE)
+#if IS_ENABLED(CONFIG_REGMAP_I2C)
        case SND_SOC_I2C:
                codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
                                                      &config);
                break;
 #endif
 
-#if defined(CONFIG_REGMAP_SPI) || defined(CONFIG_REGMAP_SPI_MODULE)
+#if IS_ENABLED(CONFIG_REGMAP_SPI)
        case SND_SOC_SPI:
                codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
                                                      &config);