[alsa-devel] [PATCH 03/11] ad193x: Use IS_ENABLED() macro

[Scott Jiang]

2013/11/21 Fabio Estevam <festevam at gmail.com>:
> From: Fabio Estevam <fabio.estevam at freescale.com>
>
> Using the IS_ENABLED() macro can make the code shorter and simpler.
>
> Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
> ---
>  sound/soc/codecs/ad193x.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c
> index aea7e52..12c27eb 100644
> --- a/sound/soc/codecs/ad193x.c
> +++ b/sound/soc/codecs/ad193x.c
> @@ -413,7 +413,7 @@ static struct spi_driver ad193x_spi_driver = {
>  };
>  #endif
>
> -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
> +#if IS_ENABLED(CONFIG_I2C)
>
>  static const struct regmap_config ad193x_i2c_regmap_config = {
>         .val_bits = 8,
> @@ -470,7 +470,7 @@ static int __init ad193x_modinit(void)
>  {
>         int ret;
>
> -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
> +#if IS_ENABLED(CONFIG_I2C)
>         ret =  i2c_add_driver(&ad193x_i2c_driver);
>         if (ret != 0) {
>                 printk(KERN_ERR "Failed to register AD193X I2C driver: %d\n",
> @@ -495,7 +495,7 @@ static void __exit ad193x_modexit(void)
>         spi_unregister_driver(&ad193x_spi_driver);
>  #endif
>
> -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
> +#if IS_ENABLED(CONFIG_I2C)
>         i2c_del_driver(&ad193x_i2c_driver);
>  #endif
>  }

Acked-by: Scott Jiang <scott.jiang.linux at gmail.com>