1 files changed, 9 insertions, 12 deletions

diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c
index 594b6a379..2c5596e77 100644
--- a/linux/drivers/media/common/saa7146_fops.c
+++ b/linux/drivers/media/common/saa7146_fops.c
@@ -274,7 +274,6 @@ static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 static int fops_mmap(struct file *file, struct vm_area_struct * vma)
 {
 	struct saa7146_fh *fh = file->private_data;
-	struct saa7146_dev *dev = fh->dev;
 	struct videobuf_queue *q;
 
 	switch (fh->type) {
@@ -298,7 +297,6 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma)
 static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait)
 {
 	struct saa7146_fh *fh = file->private_data;
-	struct saa7146_dev *dev = fh->dev;
 	struct videobuf_buffer *buf = NULL;
 	struct videobuf_queue *q;
 
@@ -330,7 +328,6 @@ static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait)
 static ssize_t fops_read(struct file *file, char *data, size_t count, loff_t *ppos)
 {
 	struct saa7146_fh *fh = file->private_data;
-	struct saa7146_dev *dev = fh->dev;
 
 	switch (fh->type) {
 	case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
@@ -350,21 +347,21 @@ static ssize_t fops_read(struct file *file, char *data, size_t count, loff_t *pp
 
 static struct file_operations video_fops =
 {
-	owner:	  THIS_MODULE,
-	open:	  fops_open,
-	release:  fops_release,
-	read:	  fops_read,
-	poll:     fops_poll,
-	mmap:	  fops_mmap,
-	ioctl:	  fops_ioctl,
-	llseek:   no_llseek,
+	.owner		= THIS_MODULE,
+	.open		= fops_open,
+	.release	= fops_release,
+	.read		= fops_read,
+	.poll		= fops_poll,
+	.mmap		= fops_mmap,
+	.ioctl		= fops_ioctl,
+	.llseek		= no_llseek,
 };
 
 void vv_callback(struct saa7146_dev *dev, unsigned long status)
 {
 	u32 isr = status;
 	
-	DEB_EE(("dev:%p, isr:0x%08x\n",dev,status));
+	DEB_EE(("dev:%p, isr:0x%08x\n",dev,(u32)status));
 
 	if (0 != (isr & (MASK_27))) {
 		DEB_INT(("irq: RPS0 (0x%08x).\n",isr));