summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2015-06-12 18:59:08 +0200
committerTakashi Iwai <tiwai@suse.de>2015-06-12 20:46:29 +0200
commit7857230f7916c5b3b6b683ed332660e8eb2e58d4 (patch)
treee22fee6990ae16b3ecc074c6924aa056d86e976f /sound
parent1b12e4cac979d20ced54f519d170b58c80e58d6e (diff)
downloadlinux-stable-7857230f7916c5b3b6b683ed332660e8eb2e58d4.tar.gz
linux-stable-7857230f7916c5b3b6b683ed332660e8eb2e58d4.tar.bz2
linux-stable-7857230f7916c5b3b6b683ed332660e8eb2e58d4.zip
sound: oss/sb_audio: use swap() in sb_audio_close()
Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/sb_audio.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
index 048439a16000..dc91072f4d82 100644
--- a/sound/oss/sb_audio.c
+++ b/sound/oss/sb_audio.c
@@ -102,12 +102,8 @@ void sb_audio_close(int dev)
if(devc->duplex
&& !devc->fullduplex
&& (devc->opened & OPEN_READ) && (devc->opened & OPEN_WRITE))
- {
- struct dma_buffparms *dmap_temp;
- dmap_temp = audio_devs[dev]->dmap_out;
- audio_devs[dev]->dmap_out = audio_devs[dev]->dmap_in;
- audio_devs[dev]->dmap_in = dmap_temp;
- }
+ swap(audio_devs[dev]->dmap_out, audio_devs[dev]->dmap_in);
+
audio_devs[dev]->dmap_out->dma = devc->dma8;
audio_devs[dev]->dmap_in->dma = ( devc->duplex ) ?
devc->dma16 : devc->dma8;