Commit 931387fa authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Mauro Carvalho Chehab

[media] drivers/media/usb/usbvision/usbvision-core.c: Remove useless return variables

This patch remove variables that are initialized with a constant,
are never updated, and are only used as parameter of return.
Return the constant instead of using a variable.

Verified by compilation only.

The coccinelle script that find and fixes this issue is:
// <smpl>
@@
type T;
constant C;
identifier ret;
@@
- T ret = C;
... when != ret
    when strict
return
- ret
+ C
;
// </smpl>
Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent e22eca78
...@@ -1463,8 +1463,6 @@ static int usbvision_write_reg_irq(struct usb_usbvision *usbvision, int address, ...@@ -1463,8 +1463,6 @@ static int usbvision_write_reg_irq(struct usb_usbvision *usbvision, int address,
static int usbvision_init_compression(struct usb_usbvision *usbvision) static int usbvision_init_compression(struct usb_usbvision *usbvision)
{ {
int err_code = 0;
usbvision->last_isoc_frame_num = -1; usbvision->last_isoc_frame_num = -1;
usbvision->isoc_data_count = 0; usbvision->isoc_data_count = 0;
usbvision->isoc_packet_count = 0; usbvision->isoc_packet_count = 0;
...@@ -1475,7 +1473,7 @@ static int usbvision_init_compression(struct usb_usbvision *usbvision) ...@@ -1475,7 +1473,7 @@ static int usbvision_init_compression(struct usb_usbvision *usbvision)
usbvision->request_intra = 1; usbvision->request_intra = 1;
usbvision->isoc_measure_bandwidth_count = 0; usbvision->isoc_measure_bandwidth_count = 0;
return err_code; return 0;
} }
/* this function measures the used bandwidth since last call /* this function measures the used bandwidth since last call
...@@ -1484,11 +1482,9 @@ static int usbvision_init_compression(struct usb_usbvision *usbvision) ...@@ -1484,11 +1482,9 @@ static int usbvision_init_compression(struct usb_usbvision *usbvision)
*/ */
static int usbvision_measure_bandwidth(struct usb_usbvision *usbvision) static int usbvision_measure_bandwidth(struct usb_usbvision *usbvision)
{ {
int err_code = 0;
if (usbvision->isoc_measure_bandwidth_count < 2) { /* this gives an average bandwidth of 3 frames */ if (usbvision->isoc_measure_bandwidth_count < 2) { /* this gives an average bandwidth of 3 frames */
usbvision->isoc_measure_bandwidth_count++; usbvision->isoc_measure_bandwidth_count++;
return err_code; return 0;
} }
if ((usbvision->isoc_packet_size > 0) && (usbvision->isoc_packet_count > 0)) { if ((usbvision->isoc_packet_size > 0) && (usbvision->isoc_packet_count > 0)) {
usbvision->used_bandwidth = usbvision->isoc_data_count / usbvision->used_bandwidth = usbvision->isoc_data_count /
...@@ -1499,7 +1495,7 @@ static int usbvision_measure_bandwidth(struct usb_usbvision *usbvision) ...@@ -1499,7 +1495,7 @@ static int usbvision_measure_bandwidth(struct usb_usbvision *usbvision)
usbvision->isoc_data_count = 0; usbvision->isoc_data_count = 0;
usbvision->isoc_packet_count = 0; usbvision->isoc_packet_count = 0;
usbvision->isoc_skip_count = 0; usbvision->isoc_skip_count = 0;
return err_code; return 0;
} }
static int usbvision_adjust_compression(struct usb_usbvision *usbvision) static int usbvision_adjust_compression(struct usb_usbvision *usbvision)
...@@ -1546,26 +1542,24 @@ static int usbvision_adjust_compression(struct usb_usbvision *usbvision) ...@@ -1546,26 +1542,24 @@ static int usbvision_adjust_compression(struct usb_usbvision *usbvision)
static int usbvision_request_intra(struct usb_usbvision *usbvision) static int usbvision_request_intra(struct usb_usbvision *usbvision)
{ {
int err_code = 0;
unsigned char buffer[1]; unsigned char buffer[1];
PDEBUG(DBG_IRQ, ""); PDEBUG(DBG_IRQ, "");
usbvision->request_intra = 1; usbvision->request_intra = 1;
buffer[0] = 1; buffer[0] = 1;
usbvision_write_reg_irq(usbvision, USBVISION_FORCE_INTRA, buffer, 1); usbvision_write_reg_irq(usbvision, USBVISION_FORCE_INTRA, buffer, 1);
return err_code; return 0;
} }
static int usbvision_unrequest_intra(struct usb_usbvision *usbvision) static int usbvision_unrequest_intra(struct usb_usbvision *usbvision)
{ {
int err_code = 0;
unsigned char buffer[1]; unsigned char buffer[1];
PDEBUG(DBG_IRQ, ""); PDEBUG(DBG_IRQ, "");
usbvision->request_intra = 0; usbvision->request_intra = 0;
buffer[0] = 0; buffer[0] = 0;
usbvision_write_reg_irq(usbvision, USBVISION_FORCE_INTRA, buffer, 1); usbvision_write_reg_irq(usbvision, USBVISION_FORCE_INTRA, buffer, 1);
return err_code; return 0;
} }
/******************************* /*******************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment