diff options
author | Arun Sharma <asharma@fb.com> | 2011-07-26 19:09:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 19:49:47 -0400 |
commit | 60063497a95e716c9a689af3be2687d261f115b4 (patch) | |
tree | 6ce0d68db76982c53df46aee5f29f944ebf2c320 /sound | |
parent | 148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed (diff) |
atomic: use <linux/atomic.h>
This allows us to move duplicated code in <asm/atomic.h>
(atomic_inc_not_zero() for now) to <linux/atomic.h>
Signed-off-by: Arun Sharma <asharma@fb.com>
Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Miller <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/echoaudio/darla20.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/darla24.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/echo3g.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/gina20.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/gina24.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/indigo.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/indigodj.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/indigodjx.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/indigoio.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/indigoiox.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/layla20.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/layla24.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/mia.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/mona.c | 2 | ||||
-rw-r--r-- | sound/pci/lx6464es/lx6464es.h | 2 | ||||
-rw-r--r-- | sound/sparc/dbri.c | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/sound/pci/echoaudio/darla20.c b/sound/pci/echoaudio/darla20.c index fe7ad64dccd7..43c7e12bc05d 100644 --- a/sound/pci/echoaudio/darla20.c +++ b/sound/pci/echoaudio/darla20.c | |||
@@ -52,7 +52,7 @@ | |||
52 | #include <sound/asoundef.h> | 52 | #include <sound/asoundef.h> |
53 | #include <sound/initval.h> | 53 | #include <sound/initval.h> |
54 | #include <asm/io.h> | 54 | #include <asm/io.h> |
55 | #include <asm/atomic.h> | 55 | #include <linux/atomic.h> |
56 | #include "echoaudio.h" | 56 | #include "echoaudio.h" |
57 | 57 | ||
58 | MODULE_FIRMWARE("ea/darla20_dsp.fw"); | 58 | MODULE_FIRMWARE("ea/darla20_dsp.fw"); |
diff --git a/sound/pci/echoaudio/darla24.c b/sound/pci/echoaudio/darla24.c index d1fd34b1a8e3..95b03306e026 100644 --- a/sound/pci/echoaudio/darla24.c +++ b/sound/pci/echoaudio/darla24.c | |||
@@ -56,7 +56,7 @@ | |||
56 | #include <sound/asoundef.h> | 56 | #include <sound/asoundef.h> |
57 | #include <sound/initval.h> | 57 | #include <sound/initval.h> |
58 | #include <asm/io.h> | 58 | #include <asm/io.h> |
59 | #include <asm/atomic.h> | 59 | #include <linux/atomic.h> |
60 | #include "echoaudio.h" | 60 | #include "echoaudio.h" |
61 | 61 | ||
62 | MODULE_FIRMWARE("ea/darla24_dsp.fw"); | 62 | MODULE_FIRMWARE("ea/darla24_dsp.fw"); |
diff --git a/sound/pci/echoaudio/echo3g.c b/sound/pci/echoaudio/echo3g.c index 1dffdc54416d..8723c40183e6 100644 --- a/sound/pci/echoaudio/echo3g.c +++ b/sound/pci/echoaudio/echo3g.c | |||
@@ -64,7 +64,7 @@ | |||
64 | #include <sound/initval.h> | 64 | #include <sound/initval.h> |
65 | #include <sound/rawmidi.h> | 65 | #include <sound/rawmidi.h> |
66 | #include <asm/io.h> | 66 | #include <asm/io.h> |
67 | #include <asm/atomic.h> | 67 | #include <linux/atomic.h> |
68 | #include "echoaudio.h" | 68 | #include "echoaudio.h" |
69 | 69 | ||
70 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 70 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/echoaudio/gina20.c b/sound/pci/echoaudio/gina20.c index 050e54aa693f..0058c67115df 100644 --- a/sound/pci/echoaudio/gina20.c +++ b/sound/pci/echoaudio/gina20.c | |||
@@ -56,7 +56,7 @@ | |||
56 | #include <sound/asoundef.h> | 56 | #include <sound/asoundef.h> |
57 | #include <sound/initval.h> | 57 | #include <sound/initval.h> |
58 | #include <asm/io.h> | 58 | #include <asm/io.h> |
59 | #include <asm/atomic.h> | 59 | #include <linux/atomic.h> |
60 | #include "echoaudio.h" | 60 | #include "echoaudio.h" |
61 | 61 | ||
62 | MODULE_FIRMWARE("ea/gina20_dsp.fw"); | 62 | MODULE_FIRMWARE("ea/gina20_dsp.fw"); |
diff --git a/sound/pci/echoaudio/gina24.c b/sound/pci/echoaudio/gina24.c index 5748fc6d29d6..14e4925e76cc 100644 --- a/sound/pci/echoaudio/gina24.c +++ b/sound/pci/echoaudio/gina24.c | |||
@@ -62,7 +62,7 @@ | |||
62 | #include <sound/asoundef.h> | 62 | #include <sound/asoundef.h> |
63 | #include <sound/initval.h> | 63 | #include <sound/initval.h> |
64 | #include <asm/io.h> | 64 | #include <asm/io.h> |
65 | #include <asm/atomic.h> | 65 | #include <linux/atomic.h> |
66 | #include "echoaudio.h" | 66 | #include "echoaudio.h" |
67 | 67 | ||
68 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 68 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/echoaudio/indigo.c b/sound/pci/echoaudio/indigo.c index 4ae5e35cb5f1..f416b154f146 100644 --- a/sound/pci/echoaudio/indigo.c +++ b/sound/pci/echoaudio/indigo.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #include <sound/asoundef.h> | 54 | #include <sound/asoundef.h> |
55 | #include <sound/initval.h> | 55 | #include <sound/initval.h> |
56 | #include <asm/io.h> | 56 | #include <asm/io.h> |
57 | #include <asm/atomic.h> | 57 | #include <linux/atomic.h> |
58 | #include "echoaudio.h" | 58 | #include "echoaudio.h" |
59 | 59 | ||
60 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 60 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/echoaudio/indigodj.c b/sound/pci/echoaudio/indigodj.c index 3550715bab1c..e594a3b2766e 100644 --- a/sound/pci/echoaudio/indigodj.c +++ b/sound/pci/echoaudio/indigodj.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #include <sound/asoundef.h> | 54 | #include <sound/asoundef.h> |
55 | #include <sound/initval.h> | 55 | #include <sound/initval.h> |
56 | #include <asm/io.h> | 56 | #include <asm/io.h> |
57 | #include <asm/atomic.h> | 57 | #include <linux/atomic.h> |
58 | #include "echoaudio.h" | 58 | #include "echoaudio.h" |
59 | 59 | ||
60 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 60 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c index 19b191fd0120..f0d00bfceee5 100644 --- a/sound/pci/echoaudio/indigodjx.c +++ b/sound/pci/echoaudio/indigodjx.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #include <sound/pcm_params.h> | 54 | #include <sound/pcm_params.h> |
55 | #include <sound/asoundef.h> | 55 | #include <sound/asoundef.h> |
56 | #include <sound/initval.h> | 56 | #include <sound/initval.h> |
57 | #include <asm/atomic.h> | 57 | #include <linux/atomic.h> |
58 | #include "echoaudio.h" | 58 | #include "echoaudio.h" |
59 | 59 | ||
60 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 60 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/echoaudio/indigoio.c b/sound/pci/echoaudio/indigoio.c index a9fcedf317a4..1af0037304c6 100644 --- a/sound/pci/echoaudio/indigoio.c +++ b/sound/pci/echoaudio/indigoio.c | |||
@@ -55,7 +55,7 @@ | |||
55 | #include <sound/asoundef.h> | 55 | #include <sound/asoundef.h> |
56 | #include <sound/initval.h> | 56 | #include <sound/initval.h> |
57 | #include <asm/io.h> | 57 | #include <asm/io.h> |
58 | #include <asm/atomic.h> | 58 | #include <linux/atomic.h> |
59 | #include "echoaudio.h" | 59 | #include "echoaudio.h" |
60 | 60 | ||
61 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 61 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/echoaudio/indigoiox.c b/sound/pci/echoaudio/indigoiox.c index bcdfac63212c..0b51163452b5 100644 --- a/sound/pci/echoaudio/indigoiox.c +++ b/sound/pci/echoaudio/indigoiox.c | |||
@@ -55,7 +55,7 @@ | |||
55 | #include <sound/pcm_params.h> | 55 | #include <sound/pcm_params.h> |
56 | #include <sound/asoundef.h> | 56 | #include <sound/asoundef.h> |
57 | #include <sound/initval.h> | 57 | #include <sound/initval.h> |
58 | #include <asm/atomic.h> | 58 | #include <linux/atomic.h> |
59 | #include "echoaudio.h" | 59 | #include "echoaudio.h" |
60 | 60 | ||
61 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 61 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/echoaudio/layla20.c b/sound/pci/echoaudio/layla20.c index d3a98c5dac86..3f63ab8dfff3 100644 --- a/sound/pci/echoaudio/layla20.c +++ b/sound/pci/echoaudio/layla20.c | |||
@@ -62,7 +62,7 @@ | |||
62 | #include <sound/initval.h> | 62 | #include <sound/initval.h> |
63 | #include <sound/rawmidi.h> | 63 | #include <sound/rawmidi.h> |
64 | #include <asm/io.h> | 64 | #include <asm/io.h> |
65 | #include <asm/atomic.h> | 65 | #include <linux/atomic.h> |
66 | #include "echoaudio.h" | 66 | #include "echoaudio.h" |
67 | 67 | ||
68 | MODULE_FIRMWARE("ea/layla20_dsp.fw"); | 68 | MODULE_FIRMWARE("ea/layla20_dsp.fw"); |
diff --git a/sound/pci/echoaudio/layla24.c b/sound/pci/echoaudio/layla24.c index 2a1dca6dce17..283137244472 100644 --- a/sound/pci/echoaudio/layla24.c +++ b/sound/pci/echoaudio/layla24.c | |||
@@ -64,7 +64,7 @@ | |||
64 | #include <sound/initval.h> | 64 | #include <sound/initval.h> |
65 | #include <sound/rawmidi.h> | 65 | #include <sound/rawmidi.h> |
66 | #include <asm/io.h> | 66 | #include <asm/io.h> |
67 | #include <asm/atomic.h> | 67 | #include <linux/atomic.h> |
68 | #include "echoaudio.h" | 68 | #include "echoaudio.h" |
69 | 69 | ||
70 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 70 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/echoaudio/mia.c b/sound/pci/echoaudio/mia.c index 9cdf14cfdd74..eddaeb4da50e 100644 --- a/sound/pci/echoaudio/mia.c +++ b/sound/pci/echoaudio/mia.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #include <sound/initval.h> | 63 | #include <sound/initval.h> |
64 | #include <sound/rawmidi.h> | 64 | #include <sound/rawmidi.h> |
65 | #include <asm/io.h> | 65 | #include <asm/io.h> |
66 | #include <asm/atomic.h> | 66 | #include <linux/atomic.h> |
67 | #include "echoaudio.h" | 67 | #include "echoaudio.h" |
68 | 68 | ||
69 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 69 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/echoaudio/mona.c b/sound/pci/echoaudio/mona.c index 1047be405ebe..0364011c237d 100644 --- a/sound/pci/echoaudio/mona.c +++ b/sound/pci/echoaudio/mona.c | |||
@@ -60,7 +60,7 @@ | |||
60 | #include <sound/asoundef.h> | 60 | #include <sound/asoundef.h> |
61 | #include <sound/initval.h> | 61 | #include <sound/initval.h> |
62 | #include <asm/io.h> | 62 | #include <asm/io.h> |
63 | #include <asm/atomic.h> | 63 | #include <linux/atomic.h> |
64 | #include "echoaudio.h" | 64 | #include "echoaudio.h" |
65 | 65 | ||
66 | MODULE_FIRMWARE("ea/loader_dsp.fw"); | 66 | MODULE_FIRMWARE("ea/loader_dsp.fw"); |
diff --git a/sound/pci/lx6464es/lx6464es.h b/sound/pci/lx6464es/lx6464es.h index e2a124ae27e8..6792eda9c9a5 100644 --- a/sound/pci/lx6464es/lx6464es.h +++ b/sound/pci/lx6464es/lx6464es.h | |||
@@ -26,7 +26,7 @@ | |||
26 | #define LX6464ES_H | 26 | #define LX6464ES_H |
27 | 27 | ||
28 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
29 | #include <asm/atomic.h> | 29 | #include <linux/atomic.h> |
30 | 30 | ||
31 | #include <sound/core.h> | 31 | #include <sound/core.h> |
32 | #include <sound/pcm.h> | 32 | #include <sound/pcm.h> |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 73f9cbacc077..1b839a0f3653 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -69,7 +69,7 @@ | |||
69 | 69 | ||
70 | #include <linux/of.h> | 70 | #include <linux/of.h> |
71 | #include <linux/of_device.h> | 71 | #include <linux/of_device.h> |
72 | #include <asm/atomic.h> | 72 | #include <linux/atomic.h> |
73 | 73 | ||
74 | MODULE_AUTHOR("Rudolf Koenig, Brent Baccala and Martin Habets"); | 74 | MODULE_AUTHOR("Rudolf Koenig, Brent Baccala and Martin Habets"); |
75 | MODULE_DESCRIPTION("Sun DBRI"); | 75 | MODULE_DESCRIPTION("Sun DBRI"); |