Browse Source

[media] cx25821: fix compiler warning

drivers/media/pci/cx25821/cx25821-video.c: In function ‘cx25821_video_register’:
drivers/media/pci/cx25821/cx25821-video.c:518:1: warning: the frame size of 1600 bytes is larger than 1024 bytes [-Wframe-larger-than=]
Fixed by just making the struct video_device template static const.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Hans Verkuil 12 years ago
parent
commit
170bd53303
2 changed files with 5 additions and 6 deletions
  1. 4 5
      drivers/media/pci/cx25821/cx25821-video.c
  2. 1 1
      drivers/media/pci/cx25821/cx25821.h

+ 4 - 5
drivers/media/pci/cx25821/cx25821-video.c

@@ -161,7 +161,7 @@ int cx25821_set_tvnorm(struct cx25821_dev *dev, v4l2_std_id norm)
 
 struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,
 				       struct pci_dev *pci,
-				       struct video_device *template,
+				       const struct video_device *template,
 				       char *type)
 {
 	struct video_device *vfd;
@@ -447,10 +447,7 @@ void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num)
 
 int cx25821_video_register(struct cx25821_dev *dev)
 {
-	int err;
-	int i;
-
-	struct video_device cx25821_video_device = {
+	static const struct video_device cx25821_video_device = {
 		.name = "cx25821-video",
 		.fops = &video_fops,
 		.minor = -1,
@@ -458,6 +455,8 @@ int cx25821_video_register(struct cx25821_dev *dev)
 		.tvnorms = CX25821_NORMS,
 		.current_norm = V4L2_STD_NTSC_M,
 	};
+	int err;
+	int i;
 
 	spin_lock_init(&dev->slock);
 

+ 1 - 1
drivers/media/pci/cx25821/cx25821.h

@@ -610,6 +610,6 @@ extern void cx25821_set_pixel_format(struct cx25821_dev *dev, int channel,
 extern void cx25821_videoioctl_unregister(struct cx25821_dev *dev);
 extern struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,
 					      struct pci_dev *pci,
-					      struct video_device *template,
+					      const struct video_device *template,
 					      char *type);
 #endif