diff options
author | Nicholas Mc Guire <der.herr@hofr.at> | 2015-01-22 05:39:11 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-02 07:59:02 -0500 |
commit | 3edf7eb83b693d5062ddd1c22c6996dce71ba2a6 (patch) | |
tree | f4e614d5f920849dac0df8f8e430d22f9c975e6a | |
parent | 1f141f6b2955f2b5556ca9522c033c3e51a95bca (diff) |
[media] pvrusb2: use msecs_to_jiffies for conversion
This is only an API consolidation and should make things more readable
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c index ff73f4036b7b..930593d7028d 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c | |||
@@ -4290,9 +4290,8 @@ static int state_eval_encoder_config(struct pvr2_hdw *hdw) | |||
4290 | the encoder. */ | 4290 | the encoder. */ |
4291 | if (!hdw->state_encoder_waitok) { | 4291 | if (!hdw->state_encoder_waitok) { |
4292 | hdw->encoder_wait_timer.expires = | 4292 | hdw->encoder_wait_timer.expires = |
4293 | jiffies + | 4293 | jiffies + msecs_to_jiffies( |
4294 | (HZ * TIME_MSEC_ENCODER_WAIT | 4294 | TIME_MSEC_ENCODER_WAIT); |
4295 | / 1000); | ||
4296 | add_timer(&hdw->encoder_wait_timer); | 4295 | add_timer(&hdw->encoder_wait_timer); |
4297 | } | 4296 | } |
4298 | } | 4297 | } |
@@ -4415,8 +4414,8 @@ static int state_eval_encoder_run(struct pvr2_hdw *hdw) | |||
4415 | if (pvr2_encoder_start(hdw) < 0) return !0; | 4414 | if (pvr2_encoder_start(hdw) < 0) return !0; |
4416 | hdw->state_encoder_run = !0; | 4415 | hdw->state_encoder_run = !0; |
4417 | if (!hdw->state_encoder_runok) { | 4416 | if (!hdw->state_encoder_runok) { |
4418 | hdw->encoder_run_timer.expires = | 4417 | hdw->encoder_run_timer.expires = jiffies + |
4419 | jiffies + (HZ * TIME_MSEC_ENCODER_OK / 1000); | 4418 | msecs_to_jiffies(TIME_MSEC_ENCODER_OK); |
4420 | add_timer(&hdw->encoder_run_timer); | 4419 | add_timer(&hdw->encoder_run_timer); |
4421 | } | 4420 | } |
4422 | } | 4421 | } |
@@ -4507,9 +4506,8 @@ static int state_eval_decoder_run(struct pvr2_hdw *hdw) | |||
4507 | but before we did the pending check. */ | 4506 | but before we did the pending check. */ |
4508 | if (!hdw->state_decoder_quiescent) { | 4507 | if (!hdw->state_decoder_quiescent) { |
4509 | hdw->quiescent_timer.expires = | 4508 | hdw->quiescent_timer.expires = |
4510 | jiffies + | 4509 | jiffies + msecs_to_jiffies( |
4511 | (HZ * TIME_MSEC_DECODER_WAIT | 4510 | TIME_MSEC_DECODER_WAIT); |
4512 | / 1000); | ||
4513 | add_timer(&hdw->quiescent_timer); | 4511 | add_timer(&hdw->quiescent_timer); |
4514 | } | 4512 | } |
4515 | } | 4513 | } |
@@ -4533,9 +4531,8 @@ static int state_eval_decoder_run(struct pvr2_hdw *hdw) | |||
4533 | hdw->state_decoder_run = !0; | 4531 | hdw->state_decoder_run = !0; |
4534 | if (hdw->decoder_client_id == PVR2_CLIENT_ID_SAA7115) { | 4532 | if (hdw->decoder_client_id == PVR2_CLIENT_ID_SAA7115) { |
4535 | hdw->decoder_stabilization_timer.expires = | 4533 | hdw->decoder_stabilization_timer.expires = |
4536 | jiffies + | 4534 | jiffies + msecs_to_jiffies( |
4537 | (HZ * TIME_MSEC_DECODER_STABILIZATION_WAIT / | 4535 | TIME_MSEC_DECODER_STABILIZATION_WAIT); |
4538 | 1000); | ||
4539 | add_timer(&hdw->decoder_stabilization_timer); | 4536 | add_timer(&hdw->decoder_stabilization_timer); |
4540 | } else { | 4537 | } else { |
4541 | hdw->state_decoder_ready = !0; | 4538 | hdw->state_decoder_ready = !0; |