diff options
Diffstat (limited to 'drivers/media/video/pvrusb2')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-audio.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-std.c | 4 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-tuner.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c index 9846c464ec80..122496f36845 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-audio.c +++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c | |||
@@ -158,7 +158,7 @@ static unsigned int pvr2_msp3400_describe(struct pvr2_msp3400_handler *ctxt, | |||
158 | } | 158 | } |
159 | 159 | ||
160 | 160 | ||
161 | const static struct pvr2_i2c_handler_functions msp3400_funcs = { | 161 | static const struct pvr2_i2c_handler_functions msp3400_funcs = { |
162 | .detach = (void (*)(void *))pvr2_msp3400_detach, | 162 | .detach = (void (*)(void *))pvr2_msp3400_detach, |
163 | .check = (int (*)(void *))msp3400_check, | 163 | .check = (int (*)(void *))msp3400_check, |
164 | .update = (void (*)(void *))msp3400_update, | 164 | .update = (void (*)(void *))msp3400_update, |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c index 848fb233d808..8df969c4874c 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | |||
@@ -226,7 +226,7 @@ static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt) | |||
226 | } | 226 | } |
227 | 227 | ||
228 | 228 | ||
229 | const static struct pvr2_i2c_handler_functions hfuncs = { | 229 | static const struct pvr2_i2c_handler_functions hfuncs = { |
230 | .detach = (void (*)(void *))decoder_detach, | 230 | .detach = (void (*)(void *))decoder_detach, |
231 | .check = (int (*)(void *))decoder_check, | 231 | .check = (int (*)(void *))decoder_check, |
232 | .update = (void (*)(void *))decoder_update, | 232 | .update = (void (*)(void *))decoder_update, |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c index f95c598ff627..c08925557ed4 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-std.c +++ b/drivers/media/video/pvrusb2/pvrusb2-std.c | |||
@@ -78,14 +78,14 @@ struct std_name { | |||
78 | #define CSTD_ALL (CSTD_PAL|CSTD_NTSC|CSTD_SECAM) | 78 | #define CSTD_ALL (CSTD_PAL|CSTD_NTSC|CSTD_SECAM) |
79 | 79 | ||
80 | /* Mapping of standard bits to color system */ | 80 | /* Mapping of standard bits to color system */ |
81 | const static struct std_name std_groups[] = { | 81 | static const struct std_name std_groups[] = { |
82 | {"PAL",CSTD_PAL}, | 82 | {"PAL",CSTD_PAL}, |
83 | {"NTSC",CSTD_NTSC}, | 83 | {"NTSC",CSTD_NTSC}, |
84 | {"SECAM",CSTD_SECAM}, | 84 | {"SECAM",CSTD_SECAM}, |
85 | }; | 85 | }; |
86 | 86 | ||
87 | /* Mapping of standard bits to modulation system */ | 87 | /* Mapping of standard bits to modulation system */ |
88 | const static struct std_name std_items[] = { | 88 | static const struct std_name std_items[] = { |
89 | {"B",TSTD_B}, | 89 | {"B",TSTD_B}, |
90 | {"B1",TSTD_B1}, | 90 | {"B1",TSTD_B1}, |
91 | {"D",TSTD_D}, | 91 | {"D",TSTD_D}, |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/drivers/media/video/pvrusb2/pvrusb2-tuner.c index af9f246f8d3f..bb17db3f6434 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-tuner.c +++ b/drivers/media/video/pvrusb2/pvrusb2-tuner.c | |||
@@ -80,7 +80,7 @@ static unsigned int pvr2_tuner_describe(struct pvr2_tuner_handler *ctxt,char *bu | |||
80 | } | 80 | } |
81 | 81 | ||
82 | 82 | ||
83 | const static struct pvr2_i2c_handler_functions tuner_funcs = { | 83 | static const struct pvr2_i2c_handler_functions tuner_funcs = { |
84 | .detach = (void (*)(void *))pvr2_tuner_detach, | 84 | .detach = (void (*)(void *))pvr2_tuner_detach, |
85 | .check = (int (*)(void *))tuner_check, | 85 | .check = (int (*)(void *))tuner_check, |
86 | .update = (void (*)(void *))tuner_update, | 86 | .update = (void (*)(void *))tuner_update, |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c index 05f2cddeb47b..2a826464911a 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | |||
@@ -201,7 +201,7 @@ static unsigned int decoder_describe(struct pvr2_v4l_decoder *ctxt,char *buf,uns | |||
201 | } | 201 | } |
202 | 202 | ||
203 | 203 | ||
204 | const static struct pvr2_i2c_handler_functions hfuncs = { | 204 | static const struct pvr2_i2c_handler_functions hfuncs = { |
205 | .detach = (void (*)(void *))decoder_detach, | 205 | .detach = (void (*)(void *))decoder_detach, |
206 | .check = (int (*)(void *))decoder_check, | 206 | .check = (int (*)(void *))decoder_check, |
207 | .update = (void (*)(void *))decoder_update, | 207 | .update = (void (*)(void *))decoder_update, |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c index 2413e5198e16..7794c34c355e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c +++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c | |||
@@ -126,7 +126,7 @@ static void wm8775_update(struct pvr2_v4l_wm8775 *ctxt) | |||
126 | } | 126 | } |
127 | 127 | ||
128 | 128 | ||
129 | const static struct pvr2_i2c_handler_functions hfuncs = { | 129 | static const struct pvr2_i2c_handler_functions hfuncs = { |
130 | .detach = (void (*)(void *))wm8775_detach, | 130 | .detach = (void (*)(void *))wm8775_detach, |
131 | .check = (int (*)(void *))wm8775_check, | 131 | .check = (int (*)(void *))wm8775_check, |
132 | .update = (void (*)(void *))wm8775_update, | 132 | .update = (void (*)(void *))wm8775_update, |