Commit 6d2412b8 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: Use IS_ENABLED() in common headers

Simplify the ifdef conditions with IS_ENABLED() macro in the common
sound headers.  No functional changes.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 58f30d65
...@@ -142,7 +142,7 @@ struct snd_card { ...@@ -142,7 +142,7 @@ struct snd_card {
wait_queue_head_t power_sleep; wait_queue_head_t power_sleep;
#endif #endif
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) #if IS_ENABLED(CONFIG_SND_MIXER_OSS)
struct snd_mixer_oss *mixer_oss; struct snd_mixer_oss *mixer_oss;
int mixer_oss_change_count; int mixer_oss_change_count;
#endif #endif
...@@ -243,7 +243,7 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size ...@@ -243,7 +243,7 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size
extern struct snd_card *snd_cards[SNDRV_CARDS]; extern struct snd_card *snd_cards[SNDRV_CARDS];
int snd_card_locked(int card); int snd_card_locked(int card);
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) #if IS_ENABLED(CONFIG_SND_MIXER_OSS)
#define SND_MIXER_OSS_NOTIFY_REGISTER 0 #define SND_MIXER_OSS_NOTIFY_REGISTER 0
#define SND_MIXER_OSS_NOTIFY_DISCONNECT 1 #define SND_MIXER_OSS_NOTIFY_DISCONNECT 1
#define SND_MIXER_OSS_NOTIFY_FREE 2 #define SND_MIXER_OSS_NOTIFY_FREE 2
...@@ -394,7 +394,7 @@ static inline void snd_printdd(const char *format, ...) {} ...@@ -394,7 +394,7 @@ static inline void snd_printdd(const char *format, ...) {}
#define SNDRV_OSS_VERSION ((3<<16)|(8<<8)|(1<<4)|(0)) /* 3.8.1a */ #define SNDRV_OSS_VERSION ((3<<16)|(8<<8)|(1<<4)|(0)) /* 3.8.1a */
/* for easier backward-porting */ /* for easier backward-porting */
#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE) #if IS_ENABLED(CONFIG_GAMEPORT)
#define gameport_set_dev_parent(gp,xdev) ((gp)->dev.parent = (xdev)) #define gameport_set_dev_parent(gp,xdev) ((gp)->dev.parent = (xdev))
#define gameport_set_port_data(gp,r) ((gp)->port_data = (r)) #define gameport_set_port_data(gp,r) ((gp)->port_data = (r))
#define gameport_get_port_data(gp) (gp)->port_data #define gameport_get_port_data(gp) (gp)->port_data
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* *
*/ */
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) #if IS_ENABLED(CONFIG_SND_MIXER_OSS)
#define SNDRV_OSS_MAX_MIXERS 32 #define SNDRV_OSS_MAX_MIXERS 32
......
...@@ -321,7 +321,7 @@ struct snd_opl3 { ...@@ -321,7 +321,7 @@ struct snd_opl3 {
unsigned char fm_mode; /* OPL mode, see SNDRV_DM_FM_MODE_XXX */ unsigned char fm_mode; /* OPL mode, see SNDRV_DM_FM_MODE_XXX */
unsigned char rhythm; /* percussion mode flag */ unsigned char rhythm; /* percussion mode flag */
unsigned char max_voices; /* max number of voices */ unsigned char max_voices; /* max number of voices */
#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) #if IS_ENABLED(CONFIG_SND_SEQUENCER)
#define SNDRV_OPL3_MODE_SYNTH 0 /* OSS - voices allocated by application */ #define SNDRV_OPL3_MODE_SYNTH 0 /* OSS - voices allocated by application */
#define SNDRV_OPL3_MODE_SEQ 1 /* ALSA - driver handles voice allocation */ #define SNDRV_OPL3_MODE_SEQ 1 /* ALSA - driver handles voice allocation */
int synth_mode; /* synth mode */ int synth_mode; /* synth mode */
...@@ -374,7 +374,7 @@ int snd_opl3_release(struct snd_hwdep * hw, struct file *file); ...@@ -374,7 +374,7 @@ int snd_opl3_release(struct snd_hwdep * hw, struct file *file);
void snd_opl3_reset(struct snd_opl3 * opl3); void snd_opl3_reset(struct snd_opl3 * opl3);
#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) #if IS_ENABLED(CONFIG_SND_SEQUENCER)
long snd_opl3_write(struct snd_hwdep *hw, const char __user *buf, long count, long snd_opl3_write(struct snd_hwdep *hw, const char __user *buf, long count,
loff_t *offset); loff_t *offset);
int snd_opl3_load_patch(struct snd_opl3 *opl3, int snd_opl3_load_patch(struct snd_opl3 *opl3,
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define snd_pcm_substream_chip(substream) ((substream)->private_data) #define snd_pcm_substream_chip(substream) ((substream)->private_data)
#define snd_pcm_chip(pcm) ((pcm)->private_data) #define snd_pcm_chip(pcm) ((pcm)->private_data)
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) #if IS_ENABLED(CONFIG_SND_PCM_OSS)
#include <sound/pcm_oss.h> #include <sound/pcm_oss.h>
#endif #endif
...@@ -418,7 +418,7 @@ struct snd_pcm_runtime { ...@@ -418,7 +418,7 @@ struct snd_pcm_runtime {
struct snd_pcm_audio_tstamp_report audio_tstamp_report; struct snd_pcm_audio_tstamp_report audio_tstamp_report;
struct timespec driver_tstamp; struct timespec driver_tstamp;
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) #if IS_ENABLED(CONFIG_SND_PCM_OSS)
/* -- OSS things -- */ /* -- OSS things -- */
struct snd_pcm_oss_runtime oss; struct snd_pcm_oss_runtime oss;
#endif #endif
...@@ -464,7 +464,7 @@ struct snd_pcm_substream { ...@@ -464,7 +464,7 @@ struct snd_pcm_substream {
unsigned int f_flags; unsigned int f_flags;
void (*pcm_release)(struct snd_pcm_substream *); void (*pcm_release)(struct snd_pcm_substream *);
struct pid *pid; struct pid *pid;
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) #if IS_ENABLED(CONFIG_SND_PCM_OSS)
/* -- OSS things -- */ /* -- OSS things -- */
struct snd_pcm_oss_substream oss; struct snd_pcm_oss_substream oss;
#endif #endif
...@@ -494,7 +494,7 @@ struct snd_pcm_str { ...@@ -494,7 +494,7 @@ struct snd_pcm_str {
unsigned int substream_count; unsigned int substream_count;
unsigned int substream_opened; unsigned int substream_opened;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) #if IS_ENABLED(CONFIG_SND_PCM_OSS)
/* -- OSS things -- */ /* -- OSS things -- */
struct snd_pcm_oss_stream oss; struct snd_pcm_oss_stream oss;
#endif #endif
...@@ -526,7 +526,7 @@ struct snd_pcm { ...@@ -526,7 +526,7 @@ struct snd_pcm {
void (*private_free) (struct snd_pcm *pcm); void (*private_free) (struct snd_pcm *pcm);
bool internal; /* pcm is for internal use only */ bool internal; /* pcm is for internal use only */
bool nonatomic; /* whole PCM operations are in non-atomic context */ bool nonatomic; /* whole PCM operations are in non-atomic context */
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) #if IS_ENABLED(CONFIG_SND_PCM_OSS)
struct snd_pcm_oss oss; struct snd_pcm_oss oss;
#endif #endif
}; };
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/device.h> #include <linux/device.h>
#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) #if IS_ENABLED(CONFIG_SND_SEQUENCER)
#include <sound/seq_device.h> #include <sound/seq_device.h>
#endif #endif
...@@ -144,7 +144,7 @@ struct snd_rawmidi { ...@@ -144,7 +144,7 @@ struct snd_rawmidi {
struct snd_info_entry *proc_entry; struct snd_info_entry *proc_entry;
#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) #if IS_ENABLED(CONFIG_SND_SEQUENCER)
struct snd_seq_device *seq_dev; struct snd_seq_device *seq_dev;
#endif #endif
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment