diff options
Diffstat (limited to 'sound/core/oss/pcm_plugin.h')
-rw-r--r-- | sound/core/oss/pcm_plugin.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/core/oss/pcm_plugin.h b/sound/core/oss/pcm_plugin.h index a5035c2369a6..c9cd29d86efd 100644 --- a/sound/core/oss/pcm_plugin.h +++ b/sound/core/oss/pcm_plugin.h | |||
@@ -126,7 +126,7 @@ int snd_pcm_plug_format_plugins(struct snd_pcm_substream *substream, | |||
126 | struct snd_pcm_hw_params *slave_params); | 126 | struct snd_pcm_hw_params *slave_params); |
127 | 127 | ||
128 | snd_pcm_format_t snd_pcm_plug_slave_format(snd_pcm_format_t format, | 128 | snd_pcm_format_t snd_pcm_plug_slave_format(snd_pcm_format_t format, |
129 | struct snd_mask *format_mask); | 129 | const struct snd_mask *format_mask); |
130 | 130 | ||
131 | int snd_pcm_plugin_append(struct snd_pcm_plugin *plugin); | 131 | int snd_pcm_plugin_append(struct snd_pcm_plugin *plugin); |
132 | 132 | ||
@@ -162,17 +162,15 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, | |||
162 | snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, | 162 | snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, |
163 | char *ptr, snd_pcm_uframes_t size, int in_kernel); | 163 | char *ptr, snd_pcm_uframes_t size, int in_kernel); |
164 | snd_pcm_sframes_t snd_pcm_oss_writev3(struct snd_pcm_substream *substream, | 164 | snd_pcm_sframes_t snd_pcm_oss_writev3(struct snd_pcm_substream *substream, |
165 | void **bufs, snd_pcm_uframes_t frames, | 165 | void **bufs, snd_pcm_uframes_t frames); |
166 | int in_kernel); | ||
167 | snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream, | 166 | snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream, |
168 | void **bufs, snd_pcm_uframes_t frames, | 167 | void **bufs, snd_pcm_uframes_t frames); |
169 | int in_kernel); | ||
170 | 168 | ||
171 | #else | 169 | #else |
172 | 170 | ||
173 | static inline snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t drv_size) { return drv_size; } | 171 | static inline snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t drv_size) { return drv_size; } |
174 | static inline snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t clt_size) { return clt_size; } | 172 | static inline snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t clt_size) { return clt_size; } |
175 | static inline int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask) { return format; } | 173 | static inline int snd_pcm_plug_slave_format(int format, const struct snd_mask *format_mask) { return format; } |
176 | 174 | ||
177 | #endif | 175 | #endif |
178 | 176 | ||