From 0fff631bd266156b0dcba44b9396f7ba85e8a0f6 Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Thu, 3 Jun 2004 04:19:00 -0700 Subject: [PATCH] [PATCH] sparse: sound/isa/gus annotation GUS annotated. --- include/sound/gus.h | 16 ++++++++-------- sound/isa/gus/gus_dram.c | 8 ++++---- sound/isa/gus/gus_instr.c | 12 ++++++------ sound/isa/gus/gus_mem_proc.c | 2 +- sound/isa/gus/gus_pcm.c | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/sound/gus.h b/include/sound/gus.h index 6cd0a22527f4c..887b03cce1af6 100644 --- a/include/sound/gus.h +++ b/include/sound/gus.h @@ -684,9 +684,9 @@ extern int snd_engine_instrument_register_ask(unsigned short mode); #endif /* 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); -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); #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) @@ -699,21 +699,21 @@ void snd_gf1_simple_init(snd_gus_voice_t *voice); /* gus_instr.c */ 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, - 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 atomic); 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, - 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 atomic); 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, - 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 atomic); diff --git a/sound/isa/gus/gus_dram.c b/sound/isa/gus/gus_dram.c index 44895d34fc5ed..0b73d4c5fc68c 100644 --- a/sound/isa/gus/gus_dram.c +++ b/sound/isa/gus/gus_dram.c @@ -26,7 +26,7 @@ #include -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 long flags; @@ -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) { 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, int rom) { @@ -95,7 +95,7 @@ static int snd_gus_dram_peek(snd_gus_card_t *gus, char *_buffer, 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, int rom) { diff --git a/sound/isa/gus/gus_instr.c b/sound/isa/gus/gus_instr.c index 031a779785734..e819e907b102a 100644 --- a/sound/isa/gus/gus_instr.c +++ b/sound/isa/gus/gus_instr.c @@ -29,7 +29,7 @@ */ 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_gf1_mem_block_t *block; @@ -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, - 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); @@ -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, - 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_gf1_mem_block_t *block; @@ -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, - 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); @@ -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, - 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_gf1_mem_block_t *block; @@ -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, - 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); diff --git a/sound/isa/gus/gus_mem_proc.c b/sound/isa/gus/gus_mem_proc.c index 32f02ad501da1..95071a0841840 100644 --- a/sound/isa/gus/gus_mem_proc.c +++ b/sound/isa/gus/gus_mem_proc.c @@ -33,7 +33,7 @@ typedef struct gus_proc_private { } gus_proc_private_t; 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; gus_proc_private_t *priv = snd_magic_cast(gus_proc_private_t, entry->private_data, return -ENXIO); diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c index a0f96cd026788..040804ca8b443 100644 --- a/sound/isa/gus/gus_pcm.c +++ b/sound/isa/gus/gus_pcm.c @@ -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, int voice, snd_pcm_uframes_t pos, - void *src, + void __user *src, snd_pcm_uframes_t count) { snd_pcm_runtime_t *runtime = substream->runtime; -- 2.53.0