summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2016-11-12 09:34:49 +0100
committerTakashi Iwai <tiwai@suse.de>2016-11-12 10:11:52 +0100
commit7e1b23b07825dd46c56b249370eec809fcc9d877 (patch)
treeb86f13cf9ddf104b4257b015eecda87d969869d8 /sound/core
parentdb0717da2a74faf7694cdfe1e591425e84ae7504 (diff)
downloadop-kernel-dev-7e1b23b07825dd46c56b249370eec809fcc9d877.zip
op-kernel-dev-7e1b23b07825dd46c56b249370eec809fcc9d877.tar.gz
ALSA: rawmidi: don't opencode IS_REACHABLE()
Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/rawmidi.c4
1 files 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;
OpenPOWER on IntegriCloud