On 15/05/2017 at 11:32:01 +0200, Takashi Iwai wrote:
> Simplify the ifdef conditions with IS_ENABLED() macro.
> No functional changes.
>
> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Acked-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
> ---
> sound/soc/atmel/atmel-pcm.h | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h
> index 6eaf081cad50..4b27aed40a51 100644
> --- a/sound/soc/atmel/atmel-pcm.h
> +++ b/sound/soc/atmel/atmel-pcm.h
> @@ -83,8 +83,7 @@ struct atmel_pcm_dma_params {
> #define ssc_readx(base, reg) (__raw_readl((base) + (reg)))
> #define ssc_writex(base, reg, value) __raw_writel((value), (base) + (reg))
>
> -#if defined(CONFIG_SND_ATMEL_SOC_PDC) || \
> - defined(CONFIG_SND_ATMEL_SOC_PDC_MODULE)
> +#if IS_ENABLED(CONFIG_SND_ATMEL_SOC_PDC)
> int atmel_pcm_pdc_platform_register(struct device *dev);
> void atmel_pcm_pdc_platform_unregister(struct device *dev);
> #else
> @@ -97,8 +96,7 @@ static inline void atmel_pcm_pdc_platform_unregister(struct device *dev)
> }
> #endif
>
> -#if defined(CONFIG_SND_ATMEL_SOC_DMA) || \
> - defined(CONFIG_SND_ATMEL_SOC_DMA_MODULE)
> +#if IS_ENABLED(CONFIG_SND_ATMEL_SOC_DMA)
> int atmel_pcm_dma_platform_register(struct device *dev);
> void atmel_pcm_dma_platform_unregister(struct device *dev);
> #else
> --
> 2.12.2
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@xxxxxxxxxxxxxxxx
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
--
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
