summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2007-12-02 22:44:43 -0600
committerMike Isely <isely@pobox.com>2007-12-02 22:44:43 -0600
commite39a15b8e87d62fd7bc1974bd27012d80048ddef (patch)
tree658fa7047670437100514cca468dd23e9c2d8638 /linux
parent44549c9cceb63ac4b50f950c361ecb2bea79bce2 (diff)
downloadmediapointer-dvb-s2-e39a15b8e87d62fd7bc1974bd27012d80048ddef.tar.gz
mediapointer-dvb-s2-e39a15b8e87d62fd7bc1974bd27012d80048ddef.tar.bz2
pvrusb2: Remove use of volatile in pipeline control state machine
From: Mike Isely <isely@pobox.com> 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>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index ff99ed5fa..dfaa347b1 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -245,14 +245,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 */