summaryrefslogtreecommitdiffstats
path: root/include/sound/pcm_params.h
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-12-29 19:41:41 +0100
committerTakashi Iwai <tiwai@suse.de>2014-12-30 16:41:54 +0100
commit744c2ad2f98965473880ef85cac2f8a8ca95959f (patch)
tree7861a2b3fe409a45310f6e4ce32c0932e07d40bd /include/sound/pcm_params.h
parentb3a8c862cd33b97c920122248ed9931af546de54 (diff)
downloadlinux-744c2ad2f98965473880ef85cac2f8a8ca95959f.tar.gz
linux-744c2ad2f98965473880ef85cac2f8a8ca95959f.tar.bz2
linux-744c2ad2f98965473880ef85cac2f8a8ca95959f.zip
ALSA: pcm: Convert params_* mask helpers to static inline functions
Use static inline functions instead of macros for the remaining params_*() helpers that have not been converted yet. This is slightly cleaner and offers better type safety. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/pcm_params.h')
-rw-r--r--include/sound/pcm_params.h24
1 files changed, 18 insertions, 6 deletions
diff --git a/include/sound/pcm_params.h b/include/sound/pcm_params.h
index 15760f5f98ee..bf51f2285c49 100644
--- a/include/sound/pcm_params.h
+++ b/include/sound/pcm_params.h
@@ -325,12 +325,24 @@ static inline int snd_interval_eq(const struct snd_interval *i1, const struct sn
i1->max == i2->max && i1->openmax == i2->openmax;
}
-#define params_access(p) ((__force snd_pcm_access_t)\
- snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_ACCESS)))
-#define params_format(p) ((__force snd_pcm_format_t)\
- snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_FORMAT)))
-#define params_subformat(p) \
- snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_SUBFORMAT))
+static inline snd_pcm_access_t params_access(const struct snd_pcm_hw_params *p)
+{
+ return (__force snd_pcm_access_t)snd_mask_min(hw_param_mask_c(p,
+ SNDRV_PCM_HW_PARAM_ACCESS));
+}
+
+static inline snd_pcm_format_t params_format(const struct snd_pcm_hw_params *p)
+{
+ return (__force snd_pcm_format_t)snd_mask_min(hw_param_mask_c(p,
+ SNDRV_PCM_HW_PARAM_FORMAT));
+}
+
+static inline snd_pcm_subformat_t
+params_subformat(const struct snd_pcm_hw_params *p)
+{
+ return (__force snd_pcm_subformat_t)snd_mask_min(hw_param_mask_c(p,
+ SNDRV_PCM_HW_PARAM_SUBFORMAT));
+}
static inline unsigned int
params_period_bytes(const struct snd_pcm_hw_params *p)