diff options
author | Mike Isely | 2007-12-03 01:44:43 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab | 2008-01-25 19:03:07 -0200 |
commit | e802c14b91e3fddd50652270756124a69e550113 (patch) | |
tree | 13c5a06f645e236a10183263c4fb11d42093399f | |
parent | 26e33048aad0486c98155b1406037f02fe70cb1b (diff) |
V4L/DVB (6707): pvrusb2: Remove use of volatile in pipeline control state machine
pvrusb2: Eliminate use of volatile in pipeline control state
variables. These were all cases of paranoia; upon further review the
overall mechanism employed here should not require use of volatile.
This had originally been done out of paranoia, and I have since been
convinced that the paranoia is not required.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h index c79d3a68dbd7..d7a216b41b72 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h @@ -229,14 +229,14 @@ struct pvr2_hdw { /* Bits of state that describe what is going on with various parts of the driver. */ - volatile int state_encoder_ok; /* Encoder is operational */ - volatile int state_encoder_run; /* Encoder is running */ - volatile int state_encoder_config; /* Encoder is configured */ - volatile int state_encoder_waitok; /* Encoder pre-wait done */ - volatile int state_decoder_run; /* Decoder is running */ - volatile int state_usbstream_run; /* FX2 is streaming */ - volatile int state_decoder_quiescent; /* Decoder idle for > 50msec */ - volatile int state_pipeline_config; /* Pipeline is configured */ + int state_encoder_ok; /* Encoder is operational */ + int state_encoder_run; /* Encoder is running */ + int state_encoder_config; /* Encoder is configured */ + int state_encoder_waitok; /* Encoder pre-wait done */ + int state_decoder_run; /* Decoder is running */ + int state_usbstream_run; /* FX2 is streaming */ + int state_decoder_quiescent; /* Decoder idle for > 50msec */ + int state_pipeline_config; /* Pipeline is configured */ int state_pipeline_req; /* Somebody wants to stream */ int state_pipeline_pause; /* Pipeline must be paused */ int state_pipeline_idle; /* Pipeline not running */ |