diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-08 11:12:47 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-13 05:46:40 -0400 |
commit | 5e246b850df563224be26f1d409cf66fd6c968df (patch) | |
tree | 970e7faf60b86cb2c489a08ca506075c398165e5 /include | |
parent | da3cec35dd3c31d8706db4bf379372ce70d92118 (diff) |
ALSA: Kill snd_assert() in other places
Kill snd_assert() in other places, either removed or replaced with
if () with snd_BUG_ON().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/vx_core.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h index 4830651cc4cf..5456343ebe4c 100644 --- a/include/sound/vx_core.h +++ b/include/sound/vx_core.h | |||
@@ -235,37 +235,31 @@ irqreturn_t snd_vx_irq_handler(int irq, void *dev); | |||
235 | */ | 235 | */ |
236 | static inline int vx_test_and_ack(struct vx_core *chip) | 236 | static inline int vx_test_and_ack(struct vx_core *chip) |
237 | { | 237 | { |
238 | snd_assert(chip->ops->test_and_ack, return -ENXIO); | ||
239 | return chip->ops->test_and_ack(chip); | 238 | return chip->ops->test_and_ack(chip); |
240 | } | 239 | } |
241 | 240 | ||
242 | static inline void vx_validate_irq(struct vx_core *chip, int enable) | 241 | static inline void vx_validate_irq(struct vx_core *chip, int enable) |
243 | { | 242 | { |
244 | snd_assert(chip->ops->validate_irq, return); | ||
245 | chip->ops->validate_irq(chip, enable); | 243 | chip->ops->validate_irq(chip, enable); |
246 | } | 244 | } |
247 | 245 | ||
248 | static inline unsigned char snd_vx_inb(struct vx_core *chip, int reg) | 246 | static inline unsigned char snd_vx_inb(struct vx_core *chip, int reg) |
249 | { | 247 | { |
250 | snd_assert(chip->ops->in8, return 0); | ||
251 | return chip->ops->in8(chip, reg); | 248 | return chip->ops->in8(chip, reg); |
252 | } | 249 | } |
253 | 250 | ||
254 | static inline unsigned int snd_vx_inl(struct vx_core *chip, int reg) | 251 | static inline unsigned int snd_vx_inl(struct vx_core *chip, int reg) |
255 | { | 252 | { |
256 | snd_assert(chip->ops->in32, return 0); | ||
257 | return chip->ops->in32(chip, reg); | 253 | return chip->ops->in32(chip, reg); |
258 | } | 254 | } |
259 | 255 | ||
260 | static inline void snd_vx_outb(struct vx_core *chip, int reg, unsigned char val) | 256 | static inline void snd_vx_outb(struct vx_core *chip, int reg, unsigned char val) |
261 | { | 257 | { |
262 | snd_assert(chip->ops->out8, return); | ||
263 | chip->ops->out8(chip, reg, val); | 258 | chip->ops->out8(chip, reg, val); |
264 | } | 259 | } |
265 | 260 | ||
266 | static inline void snd_vx_outl(struct vx_core *chip, int reg, unsigned int val) | 261 | static inline void snd_vx_outl(struct vx_core *chip, int reg, unsigned int val) |
267 | { | 262 | { |
268 | snd_assert(chip->ops->out32, return); | ||
269 | chip->ops->out32(chip, reg, val); | 263 | chip->ops->out32(chip, reg, val); |
270 | } | 264 | } |
271 | 265 | ||
@@ -276,7 +270,6 @@ static inline void snd_vx_outl(struct vx_core *chip, int reg, unsigned int val) | |||
276 | 270 | ||
277 | static inline void vx_reset_dsp(struct vx_core *chip) | 271 | static inline void vx_reset_dsp(struct vx_core *chip) |
278 | { | 272 | { |
279 | snd_assert(chip->ops->reset_dsp, return); | ||
280 | chip->ops->reset_dsp(chip); | 273 | chip->ops->reset_dsp(chip); |
281 | } | 274 | } |
282 | 275 | ||
@@ -304,14 +297,12 @@ int snd_vx_check_reg_bit(struct vx_core *chip, int reg, int mask, int bit, int t | |||
304 | static inline void vx_pseudo_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, | 297 | static inline void vx_pseudo_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
305 | struct vx_pipe *pipe, int count) | 298 | struct vx_pipe *pipe, int count) |
306 | { | 299 | { |
307 | snd_assert(chip->ops->dma_write, return); | ||
308 | chip->ops->dma_write(chip, runtime, pipe, count); | 300 | chip->ops->dma_write(chip, runtime, pipe, count); |
309 | } | 301 | } |
310 | 302 | ||
311 | static inline void vx_pseudo_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, | 303 | static inline void vx_pseudo_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
312 | struct vx_pipe *pipe, int count) | 304 | struct vx_pipe *pipe, int count) |
313 | { | 305 | { |
314 | snd_assert(chip->ops->dma_read, return); | ||
315 | chip->ops->dma_read(chip, runtime, pipe, count); | 306 | chip->ops->dma_read(chip, runtime, pipe, count); |
316 | } | 307 | } |
317 | 308 | ||