aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/pci/saa7134/saa6752hs.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/media/pci/saa7134/saa6752hs.c b/drivers/media/pci/saa7134/saa6752hs.c
index 8ac4b1f2322d..8272c0b9c5bf 100644
--- a/drivers/media/pci/saa7134/saa6752hs.c
+++ b/drivers/media/pci/saa7134/saa6752hs.c
@@ -33,11 +33,11 @@
33#include <linux/i2c.h> 33#include <linux/i2c.h>
34#include <linux/types.h> 34#include <linux/types.h>
35#include <linux/videodev2.h> 35#include <linux/videodev2.h>
36#include <linux/init.h>
37#include <linux/crc32.h>
36#include <media/v4l2-device.h> 38#include <media/v4l2-device.h>
37#include <media/v4l2-ctrls.h> 39#include <media/v4l2-ctrls.h>
38#include <media/v4l2-common.h> 40#include <media/v4l2-common.h>
39#include <linux/init.h>
40#include <linux/crc32.h>
41 41
42#define MPEG_VIDEO_TARGET_BITRATE_MAX 27000 42#define MPEG_VIDEO_TARGET_BITRATE_MAX 27000
43#define MPEG_VIDEO_MAX_BITRATE_MAX 27000 43#define MPEG_VIDEO_MAX_BITRATE_MAX 27000
@@ -124,7 +124,7 @@ static inline struct saa6752hs_state *to_state(struct v4l2_subdev *sd)
124 124
125/* ---------------------------------------------------------------------- */ 125/* ---------------------------------------------------------------------- */
126 126
127static u8 PAT[] = { 127static const u8 PAT[] = {
128 0xc2, /* i2c register */ 128 0xc2, /* i2c register */
129 0x00, /* table number for encoder */ 129 0x00, /* table number for encoder */
130 130
@@ -150,7 +150,7 @@ static u8 PAT[] = {
150 0x00, 0x00, 0x00, 0x00 /* CRC32 */ 150 0x00, 0x00, 0x00, 0x00 /* CRC32 */
151}; 151};
152 152
153static u8 PMT[] = { 153static const u8 PMT[] = {
154 0xc2, /* i2c register */ 154 0xc2, /* i2c register */
155 0x01, /* table number for encoder */ 155 0x01, /* table number for encoder */
156 156
@@ -179,7 +179,7 @@ static u8 PMT[] = {
179 0x00, 0x00, 0x00, 0x00 /* CRC32 */ 179 0x00, 0x00, 0x00, 0x00 /* CRC32 */
180}; 180};
181 181
182static u8 PMT_AC3[] = { 182static const u8 PMT_AC3[] = {
183 0xc2, /* i2c register */ 183 0xc2, /* i2c register */
184 0x01, /* table number for encoder(1) */ 184 0x01, /* table number for encoder(1) */
185 0x47, /* sync */ 185 0x47, /* sync */
@@ -212,7 +212,7 @@ static u8 PMT_AC3[] = {
212 0xED, 0xDE, 0x2D, 0xF3 /* CRC32 BE */ 212 0xED, 0xDE, 0x2D, 0xF3 /* CRC32 BE */
213}; 213};
214 214
215static struct saa6752hs_mpeg_params param_defaults = 215static const struct saa6752hs_mpeg_params param_defaults =
216{ 216{
217 .ts_pid_pmt = 16, 217 .ts_pid_pmt = 16,
218 .ts_pid_video = 260, 218 .ts_pid_video = 260,
@@ -643,13 +643,6 @@ static const struct v4l2_ctrl_ops saa6752hs_ctrl_ops = {
643 643
644static const struct v4l2_subdev_core_ops saa6752hs_core_ops = { 644static const struct v4l2_subdev_core_ops saa6752hs_core_ops = {
645 .init = saa6752hs_init, 645 .init = saa6752hs_init,
646 .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
647 .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
648 .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
649 .g_ctrl = v4l2_subdev_g_ctrl,
650 .s_ctrl = v4l2_subdev_s_ctrl,
651 .queryctrl = v4l2_subdev_queryctrl,
652 .querymenu = v4l2_subdev_querymenu,
653 .s_std = saa6752hs_s_std, 646 .s_std = saa6752hs_s_std,
654}; 647};
655 648