[media] em28xx: Don't initialize a var if won't be using it

Fixes most cases of initializing a var but not using it.

There are still 3 cases at em28xx-alsa, were those vars should
probably be used.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index 3c48a72eb7de844138deff618c2d24ac062d5a42..a24e1770db489b307777954cb6f8b3b693d98dd5 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -286,10 +286,9 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream)
 
        runtime->hw = snd_em28xx_hw_capture;
        if (dev->alt == 0 && dev->adev.users == 0) {
-               int errCode;
                dev->alt = 7;
                dprintk("changing alternate number to 7\n");
-               errCode = usb_set_interface(dev->udev, 0, 7);
+               usb_set_interface(dev->udev, 0, 7);
        }
 
        dev->adev.users++;
@@ -342,6 +341,8 @@ static int snd_em28xx_hw_capture_params(struct snd_pcm_substream *substream,
 
        ret = snd_pcm_alloc_vmalloc_buffer(substream,
                                params_buffer_bytes(hw_params));
+       if (ret < 0)
+               return ret;
        format = params_format(hw_params);
        rate = params_rate(hw_params);
        channels = params_channels(hw_params);
@@ -393,7 +394,7 @@ static int snd_em28xx_capture_trigger(struct snd_pcm_substream *substream,
                                      int cmd)
 {
        struct em28xx *dev = snd_pcm_substream_chip(substream);
-       int retval;
+       int retval = 0;
 
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
@@ -406,7 +407,7 @@ static int snd_em28xx_capture_trigger(struct snd_pcm_substream *substream,
                retval = -EINVAL;
        }
        schedule_work(&dev->wq_trigger);
-       return 0;
+       return retval;
 }
 
 static snd_pcm_uframes_t snd_em28xx_capture_pointer(struct snd_pcm_substream

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 7635a45a1220f04c820cd9c7c986819c906663c2..bbd67d754b5931030a77815377cf06befcfbe23a 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2660,10 +2660,9 @@ void em28xx_card_setup(struct em28xx *dev)
                        .addr = 0xba >> 1,
                        .platform_data = &pdata,
                };
-               struct v4l2_subdev *sd;
 
                pdata.xtal = dev->sensor_xtal;
-               sd = v4l2_i2c_new_subdev_board(&dev->v4l2_dev, &dev->i2c_adap,
+               v4l2_i2c_new_subdev_board(&dev->v4l2_dev, &dev->i2c_adap,
                                &mt9v011_info, NULL);
        }
 

diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index e33f145d867ae923772768dcc02cb08a5de54eec..55d0d9d1019f6c4f6d16b4b1dce6e14fa89157a6 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -917,7 +917,7 @@ EXPORT_SYMBOL_GPL(em28xx_set_mode);
 static void em28xx_irq_callback(struct urb *urb)
 {
        struct em28xx *dev = urb->context;
-       int rc, i;
+       int i;
 
        switch (urb->status) {
        case 0:             /* success */
@@ -934,7 +934,7 @@ static void em28xx_irq_callback(struct urb *urb)
 
        /* Copy data from URB */
        spin_lock(&dev->slock);
-       rc = dev->isoc_ctl.isoc_copy(dev, urb);
+       dev->isoc_ctl.isoc_copy(dev, urb);
        spin_unlock(&dev->slock);
 
        /* Reset urb buffers */

diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 4739fc7e6eb360397f6e21c426b805206ef20d4a..4ece6856fba01c247f7043bfb6d1b00769c69f62 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -218,9 +218,7 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, unsigned char addr,
  */
 static int em28xx_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
 {
-       char msg;
        int ret;
-       msg = addr;
 
        ret = dev->em28xx_read_reg_req(dev, 2, addr);
        if (ret < 0) {