git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6-watchdog-mm
[pandora-kernel.git]
/
sound
/
isa
/
wavefront
/
wavefront_synth.c
diff --git
a/sound/isa/wavefront/wavefront_synth.c
b/sound/isa/wavefront/wavefront_synth.c
index
679d0ae
..
78020d8
100644
(file)
--- a/
sound/isa/wavefront/wavefront_synth.c
+++ b/
sound/isa/wavefront/wavefront_synth.c
@@
-115,18
+115,11
@@
MODULE_PARM_DESC(osrun_time, "how many seconds to wait for the ICS2115 OS");
#ifdef WF_DEBUG
#ifdef WF_DEBUG
-#if defined(NEW_MACRO_VARARGS) || __GNUC__ >= 3
#define DPRINT(cond, ...) \
if ((dev->debug & (cond)) == (cond)) { \
snd_printk (__VA_ARGS__); \
}
#else
#define DPRINT(cond, ...) \
if ((dev->debug & (cond)) == (cond)) { \
snd_printk (__VA_ARGS__); \
}
#else
-#define DPRINT(cond, args...) \
- if ((dev->debug & (cond)) == (cond)) { \
- snd_printk (args); \
- }
-#endif
-#else
#define DPRINT(cond, args...)
#endif /* WF_DEBUG */
#define DPRINT(cond, args...)
#endif /* WF_DEBUG */
@@
-873,7
+866,7
@@
wavefront_send_sample (snd_wavefront_t *dev,
divided by 2.
*/
divided by 2.
*/
- u16 sample_short;
+ u16 sample_short
= 0
;
u32 length;
u16 __user *data_end = NULL;
unsigned int i;
u32 length;
u16 __user *data_end = NULL;
unsigned int i;
@@
-1075,7
+1068,7
@@
wavefront_send_sample (snd_wavefront_t *dev,
blocksize = max_blksize;
} else {
/* round to nearest 16-byte value */
blocksize = max_blksize;
} else {
/* round to nearest 16-byte value */
- blocksize =
((length-written+7)&~0x7
);
+ blocksize =
ALIGN(length - written, 8
);
}
if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_BLOCK, NULL, NULL)) {
}
if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_BLOCK, NULL, NULL)) {
@@
-1745,7
+1738,7
@@
snd_wavefront_internal_interrupt (snd_wavefront_card_t *card)
7 Unused
*/
7 Unused
*/
-static int __init
+static int __
dev
init
snd_wavefront_interrupt_bits (int irq)
{
snd_wavefront_interrupt_bits (int irq)
{
@@
-1773,7
+1766,7
@@
snd_wavefront_interrupt_bits (int irq)
return bits;
}
return bits;
}
-static void __init
+static void __
dev
init
wavefront_should_cause_interrupt (snd_wavefront_t *dev,
int val, int port, int timeout)
wavefront_should_cause_interrupt (snd_wavefront_t *dev,
int val, int port, int timeout)
@@
-1794,7
+1787,7
@@
wavefront_should_cause_interrupt (snd_wavefront_t *dev,
}
}
}
}
-static int __init
+static int __
dev
init
wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
{
wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
{
@@
-1953,7
+1946,7
@@
wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
#include <asm/uaccess.h>
#include <asm/uaccess.h>
-static int __init
+static int __
dev
init
wavefront_download_firmware (snd_wavefront_t *dev, char *path)
{
wavefront_download_firmware (snd_wavefront_t *dev, char *path)
{
@@
-2054,7
+2047,7
@@
wavefront_download_firmware (snd_wavefront_t *dev, char *path)
}
}
-static int __init
+static int __
dev
init
wavefront_do_reset (snd_wavefront_t *dev)
{
wavefront_do_reset (snd_wavefront_t *dev)
{
@@
-2143,7
+2136,7
@@
wavefront_do_reset (snd_wavefront_t *dev)
return 1;
}
return 1;
}
-int __init
+int __
dev
init
snd_wavefront_start (snd_wavefront_t *dev)
{
snd_wavefront_start (snd_wavefront_t *dev)
{
@@
-2185,7
+2178,7
@@
snd_wavefront_start (snd_wavefront_t *dev)
return (0);
}
return (0);
}
-int __init
+int __
dev
init
snd_wavefront_detect (snd_wavefront_card_t *card)
{
snd_wavefront_detect (snd_wavefront_card_t *card)
{