[media] cx25821: fix compiler warning
authorHans Verkuil <hans.verkuil@cisco.com>
Sat, 13 Apr 2013 08:19:41 +0000 (05:19 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 16 Apr 2013 19:28:26 +0000 (16:28 -0300)
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>
drivers/media/pci/cx25821/cx25821-video.c
drivers/media/pci/cx25821/cx25821.h

index 8bf9c890883bf30107531b75ea5fc7614814c510..4eaa67a0833b99123e5b7f4b1d7e18cf9bfb9d65 100644 (file)
@@ -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);
 
index 8a9c0c869412aa36d6fb0ce558755aa0e62711f1..85693cdf0ee1d61d7d8d15c81c76b5dba5fc6319 100644 (file)
@@ -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