ALSA: Use IS_ENABLED() in common headers
PATCH 1/2 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 Takashi Iwai <[email protected]>
--- include/sound/core.h | 6 +++--- include/sound/mixer_oss.h | 2 +- include/sound/opl3.h | 4 ++-- include/sound/pcm.h | 10 +++++----- include/sound/rawmidi.h | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-)
include/sound/core.h +3 -3
@@ -142,7 +142,7 @@ struct snd_card {wait_queue_head_t power_sleep;#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;int mixer_oss_change_count;#endif
@@ -243,7 +243,7 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, sizeextern struct snd_card *snd_cards[SNDRV_CARDS ];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_DISCONNECT 1#define SND_MIXER_OSS_NOTIFY_FREE 2
@@ -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 */ /* 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_port_data (gp,r) ((gp)->port_data = (r))#define gameport_get_port_data (gp) (gp)->port_data
include/sound/mixer_oss.h +1 -1
@@ -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
include/sound/opl3.h +2 -2
@@ -321,7 +321,7 @@ struct snd_opl3 {unsigned char fm_mode;/* OPL mode, see SNDRV_DM_FM_MODE_XXX */ unsigned char rhythm;/* percussion mode flag */ 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_SEQ 1/* ALSA - driver handles voice allocation */ int synth_mode;/* synth mode */
@@ -374,7 +374,7 @@ int snd_opl3_release(struct snd_hwdep * hw, struct file *file);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,loff_t *offset); int snd_opl3_load_patch(struct snd_opl3 *opl3,
include/sound/pcm.h +5 -5
@@ -34,7 +34,7 @@#define snd_pcm_substream_chip (substream) ((substream)->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> #endif
@@ -418,7 +418,7 @@ struct snd_pcm_runtime {struct snd_pcm_audio_tstamp_report audio_tstamp_report;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 -- */ struct snd_pcm_oss_runtime oss;#endif
@@ -464,7 +464,7 @@ struct snd_pcm_substream {unsigned int f_flags;void (*pcm_release)(struct snd_pcm_substream *);struct pid *pid; -#if defined(CONFIG_SND_PCM_OSS ) || defined(CONFIG_SND_PCM_OSS_MODULE ) +#if IS_ENABLED (CONFIG_SND_PCM_OSS )/* -- OSS things -- */ struct snd_pcm_oss_substream oss;#endif
@@ -494,7 +494,7 @@ struct snd_pcm_str {unsigned int substream_count;unsigned int substream_opened;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 -- */ struct snd_pcm_oss_stream oss;#endif
@@ -526,7 +526,7 @@ struct snd_pcm {void (*private_free) (struct snd_pcm *pcm);bool internal;/* pcm is for internal use only */ 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;#endif };
include/sound/rawmidi.h +2 -2
@@ -30,7 +30,7 @@#include <linux/workqueue.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> #endif
@@ -144,7 +144,7 @@ struct snd_rawmidi {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;#endif };
Signature · 1 line
2.12.2
PATCH 2/2 ALSA: cmi8238: Use IS_ENABLED()
Simplify the ifdef conditions with IS_ENABLED() macro. No functional changes.
Signed-off-by Takashi Iwai <[email protected]>
--- sound/isa/cmi8328.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/isa/cmi8328.c +1 -1
@@ -26,7 +26,7 @@ MODULE_AUTHOR("Ondrej Zary <[email protected]>");MODULE_DESCRIPTION ("C-Media CMI8328" );MODULE_LICENSE ("GPL" ); -#if defined(CONFIG_GAMEPORT ) || defined(CONFIG_GAMEPORT_MODULE ) +#if IS_ENABLED (CONFIG_GAMEPORT )#define SUPPORT_JOYSTICK 1#endif
Signature · 1 line
2.12.2