Commit 0fff631b authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sparse: sound/isa/gus annotation

GUS annotated.
parent 9d7a2c2d
...@@ -684,9 +684,9 @@ extern int snd_engine_instrument_register_ask(unsigned short mode); ...@@ -684,9 +684,9 @@ extern int snd_engine_instrument_register_ask(unsigned short mode);
#endif #endif
/* gus_dram.c */ /* gus_dram.c */
int snd_gus_dram_write(snd_gus_card_t *gus, char *ptr, int snd_gus_dram_write(snd_gus_card_t *gus, char __user *ptr,
unsigned int addr, unsigned int size); unsigned int addr, unsigned int size);
int snd_gus_dram_read(snd_gus_card_t *gus, char *ptr, int snd_gus_dram_read(snd_gus_card_t *gus, char __user *ptr,
unsigned int addr, unsigned int size, int rom); unsigned int addr, unsigned int size, int rom);
#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
...@@ -699,21 +699,21 @@ void snd_gf1_simple_init(snd_gus_voice_t *voice); ...@@ -699,21 +699,21 @@ void snd_gf1_simple_init(snd_gus_voice_t *voice);
/* gus_instr.c */ /* gus_instr.c */
int snd_gus_iwffff_put_sample(void *private_data, iwffff_wave_t *wave, int snd_gus_iwffff_put_sample(void *private_data, iwffff_wave_t *wave,
char *data, long len, int atomic); char __user *data, long len, int atomic);
int snd_gus_iwffff_get_sample(void *private_data, iwffff_wave_t *wave, int snd_gus_iwffff_get_sample(void *private_data, iwffff_wave_t *wave,
char *data, long len, int atomic); char __user *data, long len, int atomic);
int snd_gus_iwffff_remove_sample(void *private_data, iwffff_wave_t *wave, int snd_gus_iwffff_remove_sample(void *private_data, iwffff_wave_t *wave,
int atomic); int atomic);
int snd_gus_gf1_put_sample(void *private_data, gf1_wave_t *wave, int snd_gus_gf1_put_sample(void *private_data, gf1_wave_t *wave,
char *data, long len, int atomic); char __user *data, long len, int atomic);
int snd_gus_gf1_get_sample(void *private_data, gf1_wave_t *wave, int snd_gus_gf1_get_sample(void *private_data, gf1_wave_t *wave,
char *data, long len, int atomic); char __user *data, long len, int atomic);
int snd_gus_gf1_remove_sample(void *private_data, gf1_wave_t *wave, int snd_gus_gf1_remove_sample(void *private_data, gf1_wave_t *wave,
int atomic); int atomic);
int snd_gus_simple_put_sample(void *private_data, simple_instrument_t *instr, int snd_gus_simple_put_sample(void *private_data, simple_instrument_t *instr,
char *data, long len, int atomic); char __user *data, long len, int atomic);
int snd_gus_simple_get_sample(void *private_data, simple_instrument_t *instr, int snd_gus_simple_get_sample(void *private_data, simple_instrument_t *instr,
char *data, long len, int atomic); char __user *data, long len, int atomic);
int snd_gus_simple_remove_sample(void *private_data, simple_instrument_t *instr, int snd_gus_simple_remove_sample(void *private_data, simple_instrument_t *instr,
int atomic); int atomic);
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <sound/info.h> #include <sound/info.h>
static int snd_gus_dram_poke(snd_gus_card_t *gus, char *_buffer, static int snd_gus_dram_poke(snd_gus_card_t *gus, char __user *_buffer,
unsigned int address, unsigned int size) unsigned int address, unsigned int size)
{ {
unsigned long flags; unsigned long flags;
...@@ -57,13 +57,13 @@ static int snd_gus_dram_poke(snd_gus_card_t *gus, char *_buffer, ...@@ -57,13 +57,13 @@ static int snd_gus_dram_poke(snd_gus_card_t *gus, char *_buffer,
} }
int snd_gus_dram_write(snd_gus_card_t *gus, char *buffer, int snd_gus_dram_write(snd_gus_card_t *gus, char __user *buffer,
unsigned int address, unsigned int size) unsigned int address, unsigned int size)
{ {
return snd_gus_dram_poke(gus, buffer, address, size); return snd_gus_dram_poke(gus, buffer, address, size);
} }
static int snd_gus_dram_peek(snd_gus_card_t *gus, char *_buffer, static int snd_gus_dram_peek(snd_gus_card_t *gus, char __user *_buffer,
unsigned int address, unsigned int size, unsigned int address, unsigned int size,
int rom) int rom)
{ {
...@@ -95,7 +95,7 @@ static int snd_gus_dram_peek(snd_gus_card_t *gus, char *_buffer, ...@@ -95,7 +95,7 @@ static int snd_gus_dram_peek(snd_gus_card_t *gus, char *_buffer,
return 0; return 0;
} }
int snd_gus_dram_read(snd_gus_card_t *gus, char *buffer, int snd_gus_dram_read(snd_gus_card_t *gus, char __user *buffer,
unsigned int address, unsigned int size, unsigned int address, unsigned int size,
int rom) int rom)
{ {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
int snd_gus_iwffff_put_sample(void *private_data, iwffff_wave_t *wave, int snd_gus_iwffff_put_sample(void *private_data, iwffff_wave_t *wave,
char *data, long len, int atomic) char __user *data, long len, int atomic)
{ {
snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO); snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO);
snd_gf1_mem_block_t *block; snd_gf1_mem_block_t *block;
...@@ -59,7 +59,7 @@ int snd_gus_iwffff_put_sample(void *private_data, iwffff_wave_t *wave, ...@@ -59,7 +59,7 @@ int snd_gus_iwffff_put_sample(void *private_data, iwffff_wave_t *wave,
} }
int snd_gus_iwffff_get_sample(void *private_data, iwffff_wave_t *wave, int snd_gus_iwffff_get_sample(void *private_data, iwffff_wave_t *wave,
char *data, long len, int atomic) char __user *data, long len, int atomic)
{ {
snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO); snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO);
...@@ -82,7 +82,7 @@ int snd_gus_iwffff_remove_sample(void *private_data, iwffff_wave_t *wave, ...@@ -82,7 +82,7 @@ int snd_gus_iwffff_remove_sample(void *private_data, iwffff_wave_t *wave,
*/ */
int snd_gus_gf1_put_sample(void *private_data, gf1_wave_t *wave, int snd_gus_gf1_put_sample(void *private_data, gf1_wave_t *wave,
char *data, long len, int atomic) char __user *data, long len, int atomic)
{ {
snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO); snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO);
snd_gf1_mem_block_t *block; snd_gf1_mem_block_t *block;
...@@ -110,7 +110,7 @@ int snd_gus_gf1_put_sample(void *private_data, gf1_wave_t *wave, ...@@ -110,7 +110,7 @@ int snd_gus_gf1_put_sample(void *private_data, gf1_wave_t *wave,
} }
int snd_gus_gf1_get_sample(void *private_data, gf1_wave_t *wave, int snd_gus_gf1_get_sample(void *private_data, gf1_wave_t *wave,
char *data, long len, int atomic) char __user *data, long len, int atomic)
{ {
snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO); snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO);
...@@ -130,7 +130,7 @@ int snd_gus_gf1_remove_sample(void *private_data, gf1_wave_t *wave, ...@@ -130,7 +130,7 @@ int snd_gus_gf1_remove_sample(void *private_data, gf1_wave_t *wave,
*/ */
int snd_gus_simple_put_sample(void *private_data, simple_instrument_t *instr, int snd_gus_simple_put_sample(void *private_data, simple_instrument_t *instr,
char *data, long len, int atomic) char __user *data, long len, int atomic)
{ {
snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO); snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO);
snd_gf1_mem_block_t *block; snd_gf1_mem_block_t *block;
...@@ -157,7 +157,7 @@ int snd_gus_simple_put_sample(void *private_data, simple_instrument_t *instr, ...@@ -157,7 +157,7 @@ int snd_gus_simple_put_sample(void *private_data, simple_instrument_t *instr,
} }
int snd_gus_simple_get_sample(void *private_data, simple_instrument_t *instr, int snd_gus_simple_get_sample(void *private_data, simple_instrument_t *instr,
char *data, long len, int atomic) char __user *data, long len, int atomic)
{ {
snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO); snd_gus_card_t *gus = snd_magic_cast(snd_gus_card_t, private_data, return -ENXIO);
......
...@@ -33,7 +33,7 @@ typedef struct gus_proc_private { ...@@ -33,7 +33,7 @@ typedef struct gus_proc_private {
} gus_proc_private_t; } gus_proc_private_t;
static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_data, static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_data,
struct file *file, char *buf, long count) struct file *file, char __user *buf, long count)
{ {
long size; long size;
gus_proc_private_t *priv = snd_magic_cast(gus_proc_private_t, entry->private_data, return -ENXIO); gus_proc_private_t *priv = snd_magic_cast(gus_proc_private_t, entry->private_data, return -ENXIO);
......
...@@ -346,7 +346,7 @@ static int snd_gf1_pcm_poke_block(snd_gus_card_t *gus, unsigned char *buf, ...@@ -346,7 +346,7 @@ static int snd_gf1_pcm_poke_block(snd_gus_card_t *gus, unsigned char *buf,
static int snd_gf1_pcm_playback_copy(snd_pcm_substream_t *substream, static int snd_gf1_pcm_playback_copy(snd_pcm_substream_t *substream,
int voice, int voice,
snd_pcm_uframes_t pos, snd_pcm_uframes_t pos,
void *src, void __user *src,
snd_pcm_uframes_t count) snd_pcm_uframes_t count)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; snd_pcm_runtime_t *runtime = substream->runtime;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment