[PATCH] sparse: vx annotation

Both PCI and PCMCIA variants of driver annotated

diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index bcc633a55885b2071721cce341b372846727ceb9..5609f5420ac066f907a78c9d1d50409190073913 100644 (file)
--- a/include/sound/vx_core.h
+++ b/include/sound/vx_core.h
@@ -254,13 +254,13 @@ inline static unsigned int snd_vx_inl(vx_core_t *chip, int reg)
 inline static void snd_vx_outb(vx_core_t *chip, int reg, unsigned char val)
 {
        snd_assert(chip->ops->out8, return);
-       return chip->ops->out8(chip, reg, val);
+       chip->ops->out8(chip, reg, val);
 }
 
 inline static void snd_vx_outl(vx_core_t *chip, int reg, unsigned int val)
 {
        snd_assert(chip->ops->out32, return);
-       return chip->ops->out32(chip, reg, val);
+       chip->ops->out32(chip, reg, val);
 }
 
 #define vx_inb(chip,reg)       snd_vx_inb(chip, VX_##reg)

diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c
index 6f73d05e3ae75b7382d1b18f720f414c15c4d90d..c9dfb2bc123064584454de67370382f2557b6deb 100644 (file)
--- a/sound/pci/vx222/vx222_ops.c
+++ b/sound/pci/vx222/vx222_ops.c
@@ -357,7 +357,8 @@ static int vx2_load_xilinx_binary(vx_core_t *chip, const snd_hwdep_dsp_image_t *
 {
        unsigned int i;
        unsigned int port;
-       unsigned char *image, data;
+       unsigned char data;
+       unsigned char __user *image;
 
        /* XILINX reset (wait at least 1 milisecond between reset on and off). */
        vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK);

diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c
index a23eb4d19f7e64565157938c2017c2528de391d1..c0e1fd0a84d35dec4fadb821942afc839b3f434a 100644 (file)
--- a/sound/pcmcia/vx/vxp_ops.c
+++ b/sound/pcmcia/vx/vxp_ops.c
@@ -152,7 +152,8 @@ static int vxp_load_xilinx_binary(vx_core_t *_chip, const snd_hwdep_dsp_image_t
        unsigned int i;
        int c;
        int regCSUER, regRUER;
-       unsigned char *image, data;
+       unsigned char __user *image;
+       unsigned char data;
 
        /* Switch to programmation mode */
        chip->regDIALOG |= VXP_DLG_XILINX_REPROG_MASK;