[PATCH] sparse: sb annotation

sb annotation (both ALSA and OSS drivers)

diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index 2590ababcff63dabb66fda409d19a9fe348bd787..9ecd53c2155f5b0e5242e55979e62df0bbb71b0c 100644 (file)
--- a/sound/isa/sb/emu8000_patch.c
+++ b/sound/isa/sb/emu8000_patch.c
@@ -87,14 +87,14 @@ read_word(const void __user *buf, int offset, int mode)
        unsigned short c;
        if (mode & SNDRV_SFNT_SAMPLE_8BITS) {
                unsigned char cc;
-               get_user(cc, (unsigned char*)buf + offset);
+               get_user(cc, (unsigned char __user *)buf + offset);
                c = cc << 8; /* convert 8bit -> 16bit */
        } else {
 #ifdef SNDRV_LITTLE_ENDIAN
-               get_user(c, (unsigned short*)buf + offset);
+               get_user(c, (unsigned short __user *)buf + offset);
 #else
                unsigned short cc;
-               get_user(cc, (unsigned short*)buf + offset);
+               get_user(cc, (unsigned short __user *)buf + offset);
                c = swab16(cc);
 #endif
        }

diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c
index 51e4f20a17a5ba48e40c2bbd384ac123fba48fef..4d84f25198dc684ca477cc8e1b0076e1ea7d2391 100644 (file)
--- a/sound/isa/sb/emu8000_pcm.c
+++ b/sound/isa/sb/emu8000_pcm.c
@@ -515,12 +515,12 @@ static int emu8k_pcm_silence(snd_pcm_substream_t *subs,
 static int emu8k_pcm_copy(snd_pcm_substream_t *subs,
                          int voice,
                          snd_pcm_uframes_t pos,
-                         void *src,
+                         void __user *src,
                          snd_pcm_uframes_t count)
 {
        emu8k_pcm_t *rec = subs->runtime->private_data;
        emu8000_t *emu = rec->emu;
-       unsigned short *buf = src;
+       unsigned short __user *buf = src;
 
        snd_emu8000_write_wait(emu, 1);
        EMU8000_SMALW_WRITE(emu, pos + rec->loop_start[0]);

diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
index 27bf5109f020fc25395aa97b4bc1b51eba2d73d1..6cbef4688631a82120082eb866192db2600be730 100644 (file)
--- a/sound/isa/sb/sb16_csp.c
+++ b/sound/isa/sb/sb16_csp.c
@@ -89,9 +89,9 @@ static int read_register(sb_t *chip, unsigned char reg);
 static int set_mode_register(sb_t *chip, unsigned char mode);
 static int get_version(sb_t *chip);
 
-static int snd_sb_csp_riff_load(snd_sb_csp_t * p, snd_sb_csp_microcode_t * code);
+static int snd_sb_csp_riff_load(snd_sb_csp_t * p, snd_sb_csp_microcode_t __user * code);
 static int snd_sb_csp_unload(snd_sb_csp_t * p);
-static int snd_sb_csp_load_user(snd_sb_csp_t * p, const unsigned char *buf, int size, int load_flags);
+static int snd_sb_csp_load_user(snd_sb_csp_t * p, const unsigned char __user *buf, int size, int load_flags);
 static int snd_sb_csp_autoload(snd_sb_csp_t * p, int pcm_sfmt, int play_rec_mode);
 static int snd_sb_csp_check_version(snd_sb_csp_t * p);
 
@@ -213,7 +213,7 @@ static int snd_sb_csp_ioctl(snd_hwdep_t * hw, struct file *file, unsigned int cm
                info.run_width = p->run_width;
                info.version = p->version;
                info.state = p->running;
-               if (copy_to_user((void *) arg, &info, sizeof(info)))
+               if (copy_to_user((void __user *)arg, &info, sizeof(info)))
                        err = -EFAULT;
                else
                        err = 0;
@@ -222,7 +222,7 @@ static int snd_sb_csp_ioctl(snd_hwdep_t * hw, struct file *file, unsigned int cm
                /* load CSP microcode */
        case SNDRV_SB_CSP_IOCTL_LOAD_CODE:
                err = (p->running & SNDRV_SB_CSP_ST_RUNNING ?
-                      -EBUSY : snd_sb_csp_riff_load(p, (snd_sb_csp_microcode_t *) arg));
+                      -EBUSY : snd_sb_csp_riff_load(p, (snd_sb_csp_microcode_t __user *) arg));
                break;
        case SNDRV_SB_CSP_IOCTL_UNLOAD_CODE:
                err = (p->running & SNDRV_SB_CSP_ST_RUNNING ?
@@ -231,7 +231,7 @@ static int snd_sb_csp_ioctl(snd_hwdep_t * hw, struct file *file, unsigned int cm
 
                /* change CSP running state */
        case SNDRV_SB_CSP_IOCTL_START:
-               if (copy_from_user(&start_info, (void *) arg, sizeof(start_info)))
+               if (copy_from_user(&start_info, (void __user *) arg, sizeof(start_info)))
                        err = -EFAULT;
                else
                        err = snd_sb_csp_start(p, start_info.sample_width, start_info.channels);
@@ -297,11 +297,12 @@ static int snd_sb_csp_unuse(snd_sb_csp_t * p)
  * load microcode via ioctl: 
  * code is user-space pointer
  */
-static int snd_sb_csp_riff_load(snd_sb_csp_t * p, snd_sb_csp_microcode_t * mcode)
+static int snd_sb_csp_riff_load(snd_sb_csp_t * p, snd_sb_csp_microcode_t __user * mcode)
 {
        snd_sb_csp_mc_header_t info;
 
-       unsigned char *data_ptr, *data_end;
+       unsigned char __user *data_ptr;
+       unsigned char __user *data_end;
        unsigned short func_nr = 0;
 
        riff_header_t file_h, item_h, code_h;
@@ -627,7 +628,6 @@ static int snd_sb_csp_load(snd_sb_csp_t * p, const unsigned char *buf, int size,
        /* Send high byte */
        snd_sbdsp_command(p->chip, (unsigned char)((size - 1) >> 8));
        /* send microcode sequence */
-       if (load_flags & SNDRV_SB_CSP_LOAD_FROMUSER)
        /* load from kernel space */
        while (size--) {
                if (!snd_sbdsp_command(p->chip, *buf++))
@@ -675,8 +675,8 @@ static int snd_sb_csp_load(snd_sb_csp_t * p, const unsigned char *buf, int size,
        spin_unlock_irqrestore(&p->chip->reg_lock, flags);
        return result;
 }
-
-static int snd_sb_csp_load_user(snd_sb_csp_t * p, const unsigned char *buf, int size, int load_flags)
+ 
+static int snd_sb_csp_load_user(snd_sb_csp_t * p, const unsigned char __user *buf, int size, int load_flags)
 {
        int err = -ENOMEM;
        unsigned char *kbuf = kmalloc(size, GFP_KERNEL);

diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
index 7f7b1c11c47c313d98951636ee675d4afe5b58b8..40914dd0c6817add1e1a041e3dda8f088932d4cb 100644 (file)
--- a/sound/oss/sb_audio.c
+++ b/sound/oss/sb_audio.c
@@ -836,7 +836,7 @@ static signed short *lbuf16 = (signed short *)lbuf8;
 static void
 sb16_copy_from_user(int dev,
                char *localbuf, int localoffs,
-               const char *userbuf, int useroffs,
+               const char __user *userbuf, int useroffs,
                int max_in, int max_out,
                int *used, int *returned,
                int len)

diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 3639a53c748f409c7bf89dc97507fdd452a664b0..249d69cbb8a6e3f43fd174cdc19b8c07811a90a5 100644 (file)
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -943,7 +943,10 @@ void sb_setmixer(sb_devc * devc, unsigned int port, unsigned int value)
 {
        unsigned long flags;
 
-       if (devc->model == MDL_ESS) return ess_setmixer (devc, port, value);
+       if (devc->model == MDL_ESS) {
+               ess_setmixer (devc, port, value);
+               return;
+       }
 
        spin_lock_irqsave(&devc->lock, flags);