2016-11-12 08:28:43

by Fabian Frédérick

Subject: [PATCH 1/1 linux-next] ALSA: opl3: don't opencode IS_REACHABLE()

Signed-off-by: Fabian Frederick <[email protected]>
---
sound/drivers/opl3/opl3_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index 369cef2..cd9e9f3 100644
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -528,7 +528,7 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3,

opl3->hwdep = hw;
opl3->seq_dev_num = seq_device;
-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
+#if IS_REACHABLE(CONFIG_SND_SEQUENCER)
if (snd_seq_device_new(card, seq_device, SNDRV_SEQ_DEV_ID_OPL3,
sizeof(struct snd_opl3 *), &opl3->seq_dev) >= 0) {
strcpy(opl3->seq_dev->name, hw->name);
--
2.7.4

2016-11-12 09:18:17

by Takashi Iwai

Subject: Re: [PATCH 1/1 linux-next] ALSA: opl3: don't opencode IS_REACHABLE()

On Sat, 12 Nov 2016 09:28:33 +0100,
Fabian Frederick wrote:
>
> Signed-off-by: Fabian Frederick <[email protected]>

Applied, thanks.


Takashi

> ---
> sound/drivers/opl3/opl3_lib.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
> index 369cef2..cd9e9f3 100644
> --- a/sound/drivers/opl3/opl3_lib.c
> +++ b/sound/drivers/opl3/opl3_lib.c
> @@ -528,7 +528,7 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3,
>
> opl3->hwdep = hw;
> opl3->seq_dev_num = seq_device;
> -#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
> +#if IS_REACHABLE(CONFIG_SND_SEQUENCER)
> if (snd_seq_device_new(card, seq_device, SNDRV_SEQ_DEV_ID_OPL3,
> sizeof(struct snd_opl3 *), &opl3->seq_dev) >= 0) {
> strcpy(opl3->seq_dev->name, hw->name);
> --
> 2.7.4
>