2016-11-12 08:34:54

by Fabian Frédérick

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

Signed-off-by: Fabian Frederick <[email protected]>
---
sound/core/rawmidi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index b450a27..2096bb0 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -1610,7 +1610,7 @@ static int snd_rawmidi_dev_free(struct snd_device *device)
return snd_rawmidi_free(rmidi);
}

-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
+#if IS_REACHABLE(CONFIG_SND_SEQUENCER)
static void snd_rawmidi_dev_seq_free(struct snd_seq_device *device)
{
struct snd_rawmidi *rmidi = device->private_data;
@@ -1691,7 +1691,7 @@ static int snd_rawmidi_dev_register(struct snd_device *device)
}
}
rmidi->proc_entry = entry;
-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
+#if IS_REACHABLE(CONFIG_SND_SEQUENCER)
if (!rmidi->ops || !rmidi->ops->dev_register) { /* own registration mechanism */
if (snd_seq_device_new(rmidi->card, rmidi->device, SNDRV_SEQ_DEV_ID_MIDISYNTH, 0, &rmidi->seq_dev) >= 0) {
rmidi->seq_dev->private_data = rmidi;
--
2.7.4

2016-11-12 09:18:28

by Takashi Iwai

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

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

Applied, thanks.


Takashi


> ---
> sound/core/rawmidi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
> index b450a27..2096bb0 100644
> --- a/sound/core/rawmidi.c
> +++ b/sound/core/rawmidi.c
> @@ -1610,7 +1610,7 @@ static int snd_rawmidi_dev_free(struct snd_device *device)
> return snd_rawmidi_free(rmidi);
> }
>
> -#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
> +#if IS_REACHABLE(CONFIG_SND_SEQUENCER)
> static void snd_rawmidi_dev_seq_free(struct snd_seq_device *device)
> {
> struct snd_rawmidi *rmidi = device->private_data;
> @@ -1691,7 +1691,7 @@ static int snd_rawmidi_dev_register(struct snd_device *device)
> }
> }
> rmidi->proc_entry = entry;
> -#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
> +#if IS_REACHABLE(CONFIG_SND_SEQUENCER)
> if (!rmidi->ops || !rmidi->ops->dev_register) { /* own registration mechanism */
> if (snd_seq_device_new(rmidi->card, rmidi->device, SNDRV_SEQ_DEV_ID_MIDISYNTH, 0, &rmidi->seq_dev) >= 0) {
> rmidi->seq_dev->private_data = rmidi;
> --
> 2.7.4
>