static declarations where possible

1 files changed, 24 insertions, 7 deletions

diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index 735451060..cf3feda3f 100644
--- a/linux/drivers/media/common/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
@@ -1059,9 +1059,10 @@ int video_do_ioctl(struct inode *inode, struct file *file,
 /*********************************************************************************/
 /* buffer handling functions                                                  */
 
-static int buffer_activate(struct saa7146_dev *dev,
-			   struct saa7146_buf *buf,
-			   struct saa7146_buf *next)
+static 
+int buffer_activate (struct saa7146_dev *dev,
+		     struct saa7146_buf *buf,
+		     struct saa7146_buf *next)
 {
 	buf->vb.state = STATE_ACTIVE;
 	saa7146_set_capture(dev,buf,next);
@@ -1070,7 +1071,8 @@ static int buffer_activate(struct saa7146_dev *dev,
 	return 0;
 }
 
-static int buffer_prepare(struct file *file, struct videobuf_buffer *vb)
+static 
+int buffer_prepare(struct file *file, struct videobuf_buffer *vb)
 {
 	struct saa7146_fh *fh = file->private_data;
 	struct saa7146_dev *dev = fh->dev;
@@ -1145,7 +1147,8 @@ static int buffer_prepare(struct file *file, struct videobuf_buffer *vb)
 	return err;
 }
 
-static int buffer_setup(struct file *file, int *count, int *size)
+static 
+int buffer_setup(struct file *file, int *count, int *size)
 {
 	struct saa7146_fh *fh = file->private_data;
 	struct saa7146_dev *dev = fh->dev;
@@ -1165,7 +1168,8 @@ static int buffer_setup(struct file *file, int *count, int *size)
 	return 0;
 }
 
-static void buffer_queue(struct file *file, struct videobuf_buffer *vb)
+static 
+void buffer_queue(struct file *file, struct videobuf_buffer *vb)
 {
 	struct saa7146_fh *fh = file->private_data;
 	struct saa7146_dev *dev = fh->dev;
@@ -1175,7 +1179,9 @@ static void buffer_queue(struct file *file, struct videobuf_buffer *vb)
 	saa7146_buffer_queue(fh->dev,&fh->dev->video_q,buf);
 }
 
-static void buffer_release(struct file *file, struct videobuf_buffer *vb)
+
+static 
+void buffer_release(struct file *file, struct videobuf_buffer *vb)
 {
 	struct saa7146_fh *fh = file->private_data;
 	struct saa7146_dev *dev = fh->dev;
@@ -1195,10 +1201,13 @@ static struct videobuf_queue_ops video_qops = {
 /********************************************************************************/
 /* file operations */
 
+static
 struct saa7146_standard standard[] = {
 	{ "PAL-BG",	V4L2_STD_PAL_BG,	SAA7146_PAL_VALUES },
 };
 
+
+static
 void video_init(struct saa7146_dev *dev)
 {
         INIT_LIST_HEAD(&dev->video_q.queue);
@@ -1210,6 +1219,8 @@ void video_init(struct saa7146_dev *dev)
 	dev->standard = &standard[0];
 }
 
+
+static
 void video_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
 {
 	struct saa7146_format *sfmt;
@@ -1229,6 +1240,8 @@ void video_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
 	init_MUTEX(&fh->video_q.lock);
 }
 
+
+static
 void video_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file)
 {
 	unsigned long flags;
@@ -1248,6 +1261,8 @@ void video_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *fi
 	videobuf_queue_cancel(file,&fh->video_q);
 }
 
+
+static
 void video_irq_done(struct saa7146_dev *dev, unsigned long st)
 {
 	struct saa7146_dmaqueue *q = &dev->video_q;
@@ -1264,6 +1279,8 @@ void video_irq_done(struct saa7146_dev *dev, unsigned long st)
 	spin_unlock(&dev->slock);
 }
 
+
+static
 static ssize_t video_read(struct file *file, char *data, size_t count, loff_t *ppos)
 {
 	struct saa7146_fh *fh = file->private_data;