* [PATCH] ASoC: atmel: Use IS_ENABLED()
@ 2017-05-15 9:32 Takashi Iwai
2017-05-15 10:14 ` Alexandre Belloni
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Takashi Iwai @ 2017-05-15 9:32 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, Nicolas Ferre
Simplify the ifdef conditions with IS_ENABLED() macro.
No functional changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: atmel: Use IS_ENABLED()
2017-05-15 9:32 [PATCH] ASoC: atmel: Use IS_ENABLED() Takashi Iwai
@ 2017-05-15 10:14 ` Alexandre Belloni
2017-05-15 12:58 ` Nicolas Ferre
2017-05-17 9:51 ` Applied "ASoC: atmel: Use IS_ENABLED()" to the asoc tree Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Alexandre Belloni @ 2017-05-15 10:14 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Mark Brown, Nicolas Ferre
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@suse.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> 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@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
--
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: atmel: Use IS_ENABLED()
2017-05-15 9:32 [PATCH] ASoC: atmel: Use IS_ENABLED() Takashi Iwai
2017-05-15 10:14 ` Alexandre Belloni
@ 2017-05-15 12:58 ` Nicolas Ferre
2017-05-17 9:51 ` Applied "ASoC: atmel: Use IS_ENABLED()" to the asoc tree Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2017-05-15 12:58 UTC (permalink / raw)
To: Takashi Iwai, Mark Brown; +Cc: alsa-devel
Le 15/05/2017 à 11:32, Takashi Iwai a écrit :
> Simplify the ifdef conditions with IS_ENABLED() macro.
> No functional changes.
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Thanks
> ---
> 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
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 4+ messages in thread
* Applied "ASoC: atmel: Use IS_ENABLED()" to the asoc tree
2017-05-15 9:32 [PATCH] ASoC: atmel: Use IS_ENABLED() Takashi Iwai
2017-05-15 10:14 ` Alexandre Belloni
2017-05-15 12:58 ` Nicolas Ferre
@ 2017-05-17 9:51 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2017-05-17 9:51 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Mark Brown, Alexandre Belloni, Nicolas Ferre
The patch
ASoC: atmel: Use IS_ENABLED()
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From cd187753dc24e269080520aae5ee753414ba9edc Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 15 May 2017 11:32:01 +0200
Subject: [PATCH] ASoC: atmel: Use IS_ENABLED()
Simplify the ifdef conditions with IS_ENABLED() macro.
No functional changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
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.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-05-17 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-15 9:32 [PATCH] ASoC: atmel: Use IS_ENABLED() Takashi Iwai
2017-05-15 10:14 ` Alexandre Belloni
2017-05-15 12:58 ` Nicolas Ferre
2017-05-17 9:51 ` Applied "ASoC: atmel: Use IS_ENABLED()" to the asoc tree Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.