diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-27 12:11:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-27 16:07:30 -0400 |
commit | 5faf7db804e1e67ab8f78edb305d1858779a6279 (patch) | |
tree | a99c74f89f46311bef129ea134ab4a9452e7288e /drivers/media/pci/saa7164 | |
parent | 6860f9ca8ce2ef801edee2156cffaf5152bd3c39 (diff) |
[media] saa7164: get rid of warning: no previous prototype
drivers/media/pci/saa7164/saa7164-api.c:1489:5: warning: no previous prototype for 'saa7164_api_modify_gpio' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-api.c:168:5: warning: no previous prototype for 'saa7164_api_set_gop_size' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-api.c:622:5: warning: no previous prototype for 'saa7164_api_set_dif' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-api.c:825:5: warning: no previous prototype for 'saa7164_api_configure_port_vbi' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-api.c:861:5: warning: no previous prototype for 'saa7164_api_configure_port_mpeg2ts' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-api.c:895:5: warning: no previous prototype for 'saa7164_api_configure_port_mpeg2ps' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-api.c:928:5: warning: no previous prototype for 'saa7164_api_dump_subdevs' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-bus.c:109:6: warning: no previous prototype for 'saa7164_bus_dumpmsg' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-bus.c:84:6: warning: no previous prototype for 'saa7164_bus_verify' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-cmd.c:135:5: warning: no previous prototype for 'saa7164_cmd_dequeue' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-cmd.c:189:5: warning: no previous prototype for 'saa7164_cmd_set' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-cmd.c:262:5: warning: no previous prototype for 'saa7164_cmd_wait' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-cmd.c:26:5: warning: no previous prototype for 'saa7164_cmd_alloc_seqno' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-cmd.c:45:6: warning: no previous prototype for 'saa7164_cmd_free_seqno' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-cmd.c:57:6: warning: no previous prototype for 'saa7164_cmd_timeout_seqno' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-cmd.c:67:5: warning: no previous prototype for 'saa7164_cmd_timeout_get' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-encoder.c:1104:29: warning: no previous prototype for 'saa7164_enc_next_buf' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-encoder.c:1290:5: warning: no previous prototype for 'saa7164_g_chip_ident' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-encoder.c:1300:5: warning: no previous prototype for 'saa7164_g_register' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-encoder.c:1313:5: warning: no previous prototype for 'saa7164_s_register' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-fw.c:40:5: warning: no previous prototype for 'saa7164_dl_wait_ack' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-fw.c:56:5: warning: no previous prototype for 'saa7164_dl_wait_clr' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-fw.c:74:5: warning: no previous prototype for 'saa7164_downloadimage' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-vbi.c:1050:29: warning: no previous prototype for 'saa7164_vbi_next_buf' [-Wmissing-prototypes]
drivers/media/pci/saa7164/saa7164-vbi.c:987:5: warning: no previous prototype for 'saa7164_vbi_fmt' [-Wmissing-prototypes]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/saa7164')
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-api.c | 26 | ||||
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-bus.c | 6 | ||||
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-cmd.c | 16 | ||||
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-encoder.c | 15 | ||||
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-fw.c | 8 | ||||
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-vbi.c | 6 |
6 files changed, 41 insertions, 36 deletions
diff --git a/drivers/media/pci/saa7164/saa7164-api.c b/drivers/media/pci/saa7164/saa7164-api.c index eff7135cf0e8..e042963d377d 100644 --- a/drivers/media/pci/saa7164/saa7164-api.c +++ b/drivers/media/pci/saa7164/saa7164-api.c | |||
@@ -165,7 +165,7 @@ int saa7164_api_set_vbi_format(struct saa7164_port *port) | |||
165 | return ret; | 165 | return ret; |
166 | } | 166 | } |
167 | 167 | ||
168 | int saa7164_api_set_gop_size(struct saa7164_port *port) | 168 | static int saa7164_api_set_gop_size(struct saa7164_port *port) |
169 | { | 169 | { |
170 | struct saa7164_dev *dev = port->dev; | 170 | struct saa7164_dev *dev = port->dev; |
171 | struct tmComResEncVideoGopStructure gs; | 171 | struct tmComResEncVideoGopStructure gs; |
@@ -619,7 +619,7 @@ int saa7164_api_get_videomux(struct saa7164_port *port) | |||
619 | return ret; | 619 | return ret; |
620 | } | 620 | } |
621 | 621 | ||
622 | int saa7164_api_set_dif(struct saa7164_port *port, u8 reg, u8 val) | 622 | static int saa7164_api_set_dif(struct saa7164_port *port, u8 reg, u8 val) |
623 | { | 623 | { |
624 | struct saa7164_dev *dev = port->dev; | 624 | struct saa7164_dev *dev = port->dev; |
625 | 625 | ||
@@ -822,8 +822,8 @@ int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen) | |||
822 | ®[0], 128, buf); | 822 | ®[0], 128, buf); |
823 | } | 823 | } |
824 | 824 | ||
825 | int saa7164_api_configure_port_vbi(struct saa7164_dev *dev, | 825 | static int saa7164_api_configure_port_vbi(struct saa7164_dev *dev, |
826 | struct saa7164_port *port) | 826 | struct saa7164_port *port) |
827 | { | 827 | { |
828 | struct tmComResVBIFormatDescrHeader *fmt = &port->vbi_fmt_ntsc; | 828 | struct tmComResVBIFormatDescrHeader *fmt = &port->vbi_fmt_ntsc; |
829 | 829 | ||
@@ -858,9 +858,10 @@ int saa7164_api_configure_port_vbi(struct saa7164_dev *dev, | |||
858 | return 0; | 858 | return 0; |
859 | } | 859 | } |
860 | 860 | ||
861 | int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev, | 861 | static int |
862 | struct saa7164_port *port, | 862 | saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev, |
863 | struct tmComResTSFormatDescrHeader *tsfmt) | 863 | struct saa7164_port *port, |
864 | struct tmComResTSFormatDescrHeader *tsfmt) | ||
864 | { | 865 | { |
865 | dprintk(DBGLVL_API, " bFormatIndex = 0x%x\n", tsfmt->bFormatIndex); | 866 | dprintk(DBGLVL_API, " bFormatIndex = 0x%x\n", tsfmt->bFormatIndex); |
866 | dprintk(DBGLVL_API, " bDataOffset = 0x%x\n", tsfmt->bDataOffset); | 867 | dprintk(DBGLVL_API, " bDataOffset = 0x%x\n", tsfmt->bDataOffset); |
@@ -892,9 +893,10 @@ int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev, | |||
892 | return 0; | 893 | return 0; |
893 | } | 894 | } |
894 | 895 | ||
895 | int saa7164_api_configure_port_mpeg2ps(struct saa7164_dev *dev, | 896 | static int |
896 | struct saa7164_port *port, | 897 | saa7164_api_configure_port_mpeg2ps(struct saa7164_dev *dev, |
897 | struct tmComResPSFormatDescrHeader *fmt) | 898 | struct saa7164_port *port, |
899 | struct tmComResPSFormatDescrHeader *fmt) | ||
898 | { | 900 | { |
899 | dprintk(DBGLVL_API, " bFormatIndex = 0x%x\n", fmt->bFormatIndex); | 901 | dprintk(DBGLVL_API, " bFormatIndex = 0x%x\n", fmt->bFormatIndex); |
900 | dprintk(DBGLVL_API, " wPacketLength= 0x%x\n", fmt->wPacketLength); | 902 | dprintk(DBGLVL_API, " wPacketLength= 0x%x\n", fmt->wPacketLength); |
@@ -925,7 +927,7 @@ int saa7164_api_configure_port_mpeg2ps(struct saa7164_dev *dev, | |||
925 | return 0; | 927 | return 0; |
926 | } | 928 | } |
927 | 929 | ||
928 | int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len) | 930 | static int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len) |
929 | { | 931 | { |
930 | struct saa7164_port *tsport = NULL; | 932 | struct saa7164_port *tsport = NULL; |
931 | struct saa7164_port *encport = NULL; | 933 | struct saa7164_port *encport = NULL; |
@@ -1486,7 +1488,7 @@ int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8 addr, u32 datalen, | |||
1486 | return ret == SAA_OK ? 0 : -EIO; | 1488 | return ret == SAA_OK ? 0 : -EIO; |
1487 | } | 1489 | } |
1488 | 1490 | ||
1489 | int saa7164_api_modify_gpio(struct saa7164_dev *dev, u8 unitid, | 1491 | static int saa7164_api_modify_gpio(struct saa7164_dev *dev, u8 unitid, |
1490 | u8 pin, u8 state) | 1492 | u8 pin, u8 state) |
1491 | { | 1493 | { |
1492 | int ret; | 1494 | int ret; |
diff --git a/drivers/media/pci/saa7164/saa7164-bus.c b/drivers/media/pci/saa7164/saa7164-bus.c index a7f58a998752..5f6f3094c44e 100644 --- a/drivers/media/pci/saa7164/saa7164-bus.c +++ b/drivers/media/pci/saa7164/saa7164-bus.c | |||
@@ -81,7 +81,7 @@ void saa7164_bus_dump(struct saa7164_dev *dev) | |||
81 | } | 81 | } |
82 | 82 | ||
83 | /* Intensionally throw a BUG() if the state of the message bus looks corrupt */ | 83 | /* Intensionally throw a BUG() if the state of the message bus looks corrupt */ |
84 | void saa7164_bus_verify(struct saa7164_dev *dev) | 84 | static void saa7164_bus_verify(struct saa7164_dev *dev) |
85 | { | 85 | { |
86 | struct tmComResBusInfo *b = &dev->bus; | 86 | struct tmComResBusInfo *b = &dev->bus; |
87 | int bug = 0; | 87 | int bug = 0; |
@@ -106,8 +106,8 @@ void saa7164_bus_verify(struct saa7164_dev *dev) | |||
106 | } | 106 | } |
107 | } | 107 | } |
108 | 108 | ||
109 | void saa7164_bus_dumpmsg(struct saa7164_dev *dev, struct tmComResInfo* m, | 109 | static void saa7164_bus_dumpmsg(struct saa7164_dev *dev, struct tmComResInfo *m, |
110 | void *buf) | 110 | void *buf) |
111 | { | 111 | { |
112 | dprintk(DBGLVL_BUS, "Dumping msg structure:\n"); | 112 | dprintk(DBGLVL_BUS, "Dumping msg structure:\n"); |
113 | dprintk(DBGLVL_BUS, " .id = %d\n", m->id); | 113 | dprintk(DBGLVL_BUS, " .id = %d\n", m->id); |
diff --git a/drivers/media/pci/saa7164/saa7164-cmd.c b/drivers/media/pci/saa7164/saa7164-cmd.c index 62fac7f9d04e..cfabcbacc33d 100644 --- a/drivers/media/pci/saa7164/saa7164-cmd.c +++ b/drivers/media/pci/saa7164/saa7164-cmd.c | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | #include "saa7164.h" | 24 | #include "saa7164.h" |
25 | 25 | ||
26 | int saa7164_cmd_alloc_seqno(struct saa7164_dev *dev) | 26 | static int saa7164_cmd_alloc_seqno(struct saa7164_dev *dev) |
27 | { | 27 | { |
28 | int i, ret = -1; | 28 | int i, ret = -1; |
29 | 29 | ||
@@ -42,7 +42,7 @@ int saa7164_cmd_alloc_seqno(struct saa7164_dev *dev) | |||
42 | return ret; | 42 | return ret; |
43 | } | 43 | } |
44 | 44 | ||
45 | void saa7164_cmd_free_seqno(struct saa7164_dev *dev, u8 seqno) | 45 | static void saa7164_cmd_free_seqno(struct saa7164_dev *dev, u8 seqno) |
46 | { | 46 | { |
47 | mutex_lock(&dev->lock); | 47 | mutex_lock(&dev->lock); |
48 | if ((dev->cmds[seqno].inuse == 1) && | 48 | if ((dev->cmds[seqno].inuse == 1) && |
@@ -54,7 +54,7 @@ void saa7164_cmd_free_seqno(struct saa7164_dev *dev, u8 seqno) | |||
54 | mutex_unlock(&dev->lock); | 54 | mutex_unlock(&dev->lock); |
55 | } | 55 | } |
56 | 56 | ||
57 | void saa7164_cmd_timeout_seqno(struct saa7164_dev *dev, u8 seqno) | 57 | static void saa7164_cmd_timeout_seqno(struct saa7164_dev *dev, u8 seqno) |
58 | { | 58 | { |
59 | mutex_lock(&dev->lock); | 59 | mutex_lock(&dev->lock); |
60 | if ((dev->cmds[seqno].inuse == 1) && | 60 | if ((dev->cmds[seqno].inuse == 1) && |
@@ -64,7 +64,7 @@ void saa7164_cmd_timeout_seqno(struct saa7164_dev *dev, u8 seqno) | |||
64 | mutex_unlock(&dev->lock); | 64 | mutex_unlock(&dev->lock); |
65 | } | 65 | } |
66 | 66 | ||
67 | u32 saa7164_cmd_timeout_get(struct saa7164_dev *dev, u8 seqno) | 67 | static u32 saa7164_cmd_timeout_get(struct saa7164_dev *dev, u8 seqno) |
68 | { | 68 | { |
69 | int ret = 0; | 69 | int ret = 0; |
70 | 70 | ||
@@ -132,7 +132,7 @@ int saa7164_irq_dequeue(struct saa7164_dev *dev) | |||
132 | 132 | ||
133 | /* Commands to the f/w get marshelled to/from this code then onto the PCI | 133 | /* Commands to the f/w get marshelled to/from this code then onto the PCI |
134 | * -bus/c running buffer. */ | 134 | * -bus/c running buffer. */ |
135 | int saa7164_cmd_dequeue(struct saa7164_dev *dev) | 135 | static int saa7164_cmd_dequeue(struct saa7164_dev *dev) |
136 | { | 136 | { |
137 | int loop = 1; | 137 | int loop = 1; |
138 | int ret; | 138 | int ret; |
@@ -186,8 +186,8 @@ int saa7164_cmd_dequeue(struct saa7164_dev *dev) | |||
186 | return SAA_OK; | 186 | return SAA_OK; |
187 | } | 187 | } |
188 | 188 | ||
189 | int saa7164_cmd_set(struct saa7164_dev *dev, struct tmComResInfo *msg, | 189 | static int saa7164_cmd_set(struct saa7164_dev *dev, struct tmComResInfo *msg, |
190 | void *buf) | 190 | void *buf) |
191 | { | 191 | { |
192 | struct tmComResBusInfo *bus = &dev->bus; | 192 | struct tmComResBusInfo *bus = &dev->bus; |
193 | u8 cmd_sent; | 193 | u8 cmd_sent; |
@@ -259,7 +259,7 @@ out: | |||
259 | /* Wait for a signal event, without holding a mutex. Either return TIMEOUT if | 259 | /* Wait for a signal event, without holding a mutex. Either return TIMEOUT if |
260 | * the event never occurred, or SAA_OK if it was signaled during the wait. | 260 | * the event never occurred, or SAA_OK if it was signaled during the wait. |
261 | */ | 261 | */ |
262 | int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) | 262 | static int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) |
263 | { | 263 | { |
264 | wait_queue_head_t *q = NULL; | 264 | wait_queue_head_t *q = NULL; |
265 | int ret = SAA_BUS_TIMEOUT; | 265 | int ret = SAA_BUS_TIMEOUT; |
diff --git a/drivers/media/pci/saa7164/saa7164-encoder.c b/drivers/media/pci/saa7164/saa7164-encoder.c index a9ed686ad08a..994018e2d0d6 100644 --- a/drivers/media/pci/saa7164/saa7164-encoder.c +++ b/drivers/media/pci/saa7164/saa7164-encoder.c | |||
@@ -1101,7 +1101,8 @@ static int fops_release(struct file *file) | |||
1101 | return 0; | 1101 | return 0; |
1102 | } | 1102 | } |
1103 | 1103 | ||
1104 | struct saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port) | 1104 | static struct |
1105 | saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port) | ||
1105 | { | 1106 | { |
1106 | struct saa7164_user_buffer *ubuf = NULL; | 1107 | struct saa7164_user_buffer *ubuf = NULL; |
1107 | struct saa7164_dev *dev = port->dev; | 1108 | struct saa7164_dev *dev = port->dev; |
@@ -1287,8 +1288,8 @@ static const struct v4l2_file_operations mpeg_fops = { | |||
1287 | .unlocked_ioctl = video_ioctl2, | 1288 | .unlocked_ioctl = video_ioctl2, |
1288 | }; | 1289 | }; |
1289 | 1290 | ||
1290 | int saa7164_g_chip_ident(struct file *file, void *fh, | 1291 | static int saa7164_g_chip_ident(struct file *file, void *fh, |
1291 | struct v4l2_dbg_chip_ident *chip) | 1292 | struct v4l2_dbg_chip_ident *chip) |
1292 | { | 1293 | { |
1293 | struct saa7164_port *port = ((struct saa7164_encoder_fh *)fh)->port; | 1294 | struct saa7164_port *port = ((struct saa7164_encoder_fh *)fh)->port; |
1294 | struct saa7164_dev *dev = port->dev; | 1295 | struct saa7164_dev *dev = port->dev; |
@@ -1297,8 +1298,8 @@ int saa7164_g_chip_ident(struct file *file, void *fh, | |||
1297 | return 0; | 1298 | return 0; |
1298 | } | 1299 | } |
1299 | 1300 | ||
1300 | int saa7164_g_register(struct file *file, void *fh, | 1301 | static int saa7164_g_register(struct file *file, void *fh, |
1301 | struct v4l2_dbg_register *reg) | 1302 | struct v4l2_dbg_register *reg) |
1302 | { | 1303 | { |
1303 | struct saa7164_port *port = ((struct saa7164_encoder_fh *)fh)->port; | 1304 | struct saa7164_port *port = ((struct saa7164_encoder_fh *)fh)->port; |
1304 | struct saa7164_dev *dev = port->dev; | 1305 | struct saa7164_dev *dev = port->dev; |
@@ -1310,8 +1311,8 @@ int saa7164_g_register(struct file *file, void *fh, | |||
1310 | return 0; | 1311 | return 0; |
1311 | } | 1312 | } |
1312 | 1313 | ||
1313 | int saa7164_s_register(struct file *file, void *fh, | 1314 | static int saa7164_s_register(struct file *file, void *fh, |
1314 | struct v4l2_dbg_register *reg) | 1315 | struct v4l2_dbg_register *reg) |
1315 | { | 1316 | { |
1316 | struct saa7164_port *port = ((struct saa7164_encoder_fh *)fh)->port; | 1317 | struct saa7164_port *port = ((struct saa7164_encoder_fh *)fh)->port; |
1317 | struct saa7164_dev *dev = port->dev; | 1318 | struct saa7164_dev *dev = port->dev; |
diff --git a/drivers/media/pci/saa7164/saa7164-fw.c b/drivers/media/pci/saa7164/saa7164-fw.c index a266bf0169e6..86763203d61d 100644 --- a/drivers/media/pci/saa7164/saa7164-fw.c +++ b/drivers/media/pci/saa7164/saa7164-fw.c | |||
@@ -37,7 +37,7 @@ struct fw_header { | |||
37 | u32 version; | 37 | u32 version; |
38 | }; | 38 | }; |
39 | 39 | ||
40 | int saa7164_dl_wait_ack(struct saa7164_dev *dev, u32 reg) | 40 | static int saa7164_dl_wait_ack(struct saa7164_dev *dev, u32 reg) |
41 | { | 41 | { |
42 | u32 timeout = SAA_DEVICE_TIMEOUT; | 42 | u32 timeout = SAA_DEVICE_TIMEOUT; |
43 | while ((saa7164_readl(reg) & 0x01) == 0) { | 43 | while ((saa7164_readl(reg) & 0x01) == 0) { |
@@ -53,7 +53,7 @@ int saa7164_dl_wait_ack(struct saa7164_dev *dev, u32 reg) | |||
53 | return 0; | 53 | return 0; |
54 | } | 54 | } |
55 | 55 | ||
56 | int saa7164_dl_wait_clr(struct saa7164_dev *dev, u32 reg) | 56 | static int saa7164_dl_wait_clr(struct saa7164_dev *dev, u32 reg) |
57 | { | 57 | { |
58 | u32 timeout = SAA_DEVICE_TIMEOUT; | 58 | u32 timeout = SAA_DEVICE_TIMEOUT; |
59 | while (saa7164_readl(reg) & 0x01) { | 59 | while (saa7164_readl(reg) & 0x01) { |
@@ -71,8 +71,8 @@ int saa7164_dl_wait_clr(struct saa7164_dev *dev, u32 reg) | |||
71 | 71 | ||
72 | /* TODO: move dlflags into dev-> and change to write/readl/b */ | 72 | /* TODO: move dlflags into dev-> and change to write/readl/b */ |
73 | /* TODO: Excessive levels of debug */ | 73 | /* TODO: Excessive levels of debug */ |
74 | int saa7164_downloadimage(struct saa7164_dev *dev, u8 *src, u32 srcsize, | 74 | static int saa7164_downloadimage(struct saa7164_dev *dev, u8 *src, u32 srcsize, |
75 | u32 dlflags, u8 *dst, u32 dstsize) | 75 | u32 dlflags, u8 *dst, u32 dstsize) |
76 | { | 76 | { |
77 | u32 reg, timeout, offset; | 77 | u32 reg, timeout, offset; |
78 | u8 *srcbuf = NULL; | 78 | u8 *srcbuf = NULL; |
diff --git a/drivers/media/pci/saa7164/saa7164-vbi.c b/drivers/media/pci/saa7164/saa7164-vbi.c index d8e6c8f14079..b4532299c0ed 100644 --- a/drivers/media/pci/saa7164/saa7164-vbi.c +++ b/drivers/media/pci/saa7164/saa7164-vbi.c | |||
@@ -984,7 +984,8 @@ out: | |||
984 | return ret; | 984 | return ret; |
985 | } | 985 | } |
986 | 986 | ||
987 | int saa7164_vbi_fmt(struct file *file, void *priv, struct v4l2_format *f) | 987 | static int saa7164_vbi_fmt(struct file *file, void *priv, |
988 | struct v4l2_format *f) | ||
988 | { | 989 | { |
989 | /* ntsc */ | 990 | /* ntsc */ |
990 | f->fmt.vbi.samples_per_line = 1600; | 991 | f->fmt.vbi.samples_per_line = 1600; |
@@ -1047,7 +1048,8 @@ static int fops_release(struct file *file) | |||
1047 | return 0; | 1048 | return 0; |
1048 | } | 1049 | } |
1049 | 1050 | ||
1050 | struct saa7164_user_buffer *saa7164_vbi_next_buf(struct saa7164_port *port) | 1051 | static struct |
1052 | saa7164_user_buffer *saa7164_vbi_next_buf(struct saa7164_port *port) | ||
1051 | { | 1053 | { |
1052 | struct saa7164_user_buffer *ubuf = NULL; | 1054 | struct saa7164_user_buffer *ubuf = NULL; |
1053 | struct saa7164_dev *dev = port->dev; | 1055 | struct saa7164_dev *dev = port->dev; |