All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [media] [pvrusb2]: remove dead retry cmd code
@ 2015-01-05 22:38 Haim Daniel
  2015-01-16 10:57 ` Hans Verkuil
  0 siblings, 1 reply; 7+ messages in thread
From: Haim Daniel @ 2015-01-05 22:38 UTC (permalink / raw)
  To: linux-media; +Cc: Haim Daniel

In case a command is timed out, current flow sets the retry_flag
and does nothing.

Signed-off-by: Haim Daniel <haim.daniel@gmail.com>
---
 drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/media/usb/pvrusb2/pvrusb2-encoder.c b/drivers/media/usb/pvrusb2/pvrusb2-encoder.c
index f7702ae..02028aa 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-encoder.c
@@ -145,8 +145,6 @@ static int pvr2_encoder_cmd(void *ctxt,
 			    u32 *argp)
 {
 	unsigned int poll_count;
-	unsigned int try_count = 0;
-	int retry_flag;
 	int ret = 0;
 	unsigned int idx;
 	/* These sizes look to be limited by the FX2 firmware implementation */
@@ -213,8 +211,6 @@ static int pvr2_encoder_cmd(void *ctxt,
 			break;
 		}
 
-		retry_flag = 0;
-		try_count++;
 		ret = 0;
 		wrData[0] = 0;
 		wrData[1] = cmd;
@@ -245,11 +241,9 @@ static int pvr2_encoder_cmd(void *ctxt,
 			}
 			if (rdData[0] && (poll_count < 1000)) continue;
 			if (!rdData[0]) {
-				retry_flag = !0;
 				pvr2_trace(
 					PVR2_TRACE_ERROR_LEGS,
-					"Encoder timed out waiting for us"
-					"; arranging to retry");
+					"Encoder timed out waiting for us");
 			} else {
 				pvr2_trace(
 					PVR2_TRACE_ERROR_LEGS,
@@ -269,13 +263,6 @@ static int pvr2_encoder_cmd(void *ctxt,
 			ret = -EBUSY;
 			break;
 		}
-		if (retry_flag) {
-			if (try_count < 20) continue;
-			pvr2_trace(
-				PVR2_TRACE_ERROR_LEGS,
-				"Too many retries...");
-			ret = -EBUSY;
-		}
 		if (ret) {
 			del_timer_sync(&hdw->encoder_run_timer);
 			hdw->state_encoder_ok = 0;
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-01-25 23:37 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-05 22:38 [PATCH] [media] [pvrusb2]: remove dead retry cmd code Haim Daniel
2015-01-16 10:57 ` Hans Verkuil
2015-01-16 11:29   ` Haim Daniel
2015-01-16 11:37     ` Hans Verkuil
2015-01-16 11:45       ` Haim Daniel
2015-01-25  0:45       ` Mike Isely
2015-01-25 23:37         ` isely

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.