lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Mauro Carvalho Chehab
2011-06-17 20:28:51 -03:00
parent 67a8dbbc4e
commit 00d2e7ad9d
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/video/em28xx/em28xx-audio.c
View File

@@ -286,10 +286,9 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream)
runtime->hw = snd_em28xx_hw_capture; runtime->hw = snd_em28xx_hw_capture;
if (dev->alt == 0 && dev->adev.users == 0) { if (dev->alt == 0 && dev->adev.users == 0) {
int errCode;
dev->alt = 7; dev->alt = 7;
dprintk("changing alternate number to 7\n"); 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++; 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, ret = snd_pcm_alloc_vmalloc_buffer(substream,
params_buffer_bytes(hw_params)); params_buffer_bytes(hw_params));
if (ret < 0)
return ret;
format = params_format(hw_params); format = params_format(hw_params);
rate = params_rate(hw_params); rate = params_rate(hw_params);
channels = params_channels(hw_params); channels = params_channels(hw_params);
@@ -393,7 +394,7 @@ static int snd_em28xx_capture_trigger(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
struct em28xx *dev = snd_pcm_substream_chip(substream); struct em28xx *dev = snd_pcm_substream_chip(substream);
int retval; int retval = 0;
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
@@ -406,7 +407,7 @@ static int snd_em28xx_capture_trigger(struct snd_pcm_substream *substream,
retval = -EINVAL; retval = -EINVAL;
} }
schedule_work(&dev->wq_trigger); schedule_work(&dev->wq_trigger);
return 0; return retval;
} }
static snd_pcm_uframes_t snd_em28xx_capture_pointer(struct snd_pcm_substream static snd_pcm_uframes_t snd_em28xx_capture_pointer(struct snd_pcm_substream

3
drivers/media/video/em28xx/em28xx-cards.c
View File

@@ -2660,10 +2660,9 @@ void em28xx_card_setup(struct em28xx *dev)
.addr = 0xba >> 1, .addr = 0xba >> 1,
.platform_data = &pdata, .platform_data = &pdata,
}; };
struct v4l2_subdev *sd;
pdata.xtal = dev->sensor_xtal; 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); &mt9v011_info, NULL);
} }

4
drivers/media/video/em28xx/em28xx-core.c
View File

@@ -917,7 +917,7 @@ EXPORT_SYMBOL_GPL(em28xx_set_mode);
static void em28xx_irq_callback(struct urb *urb) static void em28xx_irq_callback(struct urb *urb)
{ {
struct em28xx *dev = urb->context; struct em28xx *dev = urb->context;
int rc, i; int i;
switch (urb->status) { switch (urb->status) {
case 0: /* success */ case 0: /* success */
@@ -934,7 +934,7 @@ static void em28xx_irq_callback(struct urb *urb)
/* Copy data from URB */ /* Copy data from URB */
spin_lock(&dev->slock); spin_lock(&dev->slock);
rc = dev->isoc_ctl.isoc_copy(dev, urb); dev->isoc_ctl.isoc_copy(dev, urb);
spin_unlock(&dev->slock); spin_unlock(&dev->slock);
/* Reset urb buffers */ /* Reset urb buffers */

2
drivers/media/video/em28xx/em28xx-i2c.c
View File

@@ -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) static int em28xx_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
{ {
char msg;
int ret; int ret;
msg = addr;
ret = dev->em28xx_read_reg_req(dev, 2, addr); ret = dev->em28xx_read_reg_req(dev, 2, addr);
if (ret < 0) { if (ret < 0) {