[PATCH 1/2] Build fix for n800_defconfig

[PATCH 1/2] Build fix for n800_defconfig

[Hiroshi DOYU]

Just updated from the latest header file.

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
---
 drivers/media/radio/radio-tea5761.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/media/radio/radio-tea5761.c b/drivers/media/radio/radio-tea5761.c
index e8ccf29..1c6d8ab 100644
--- a/drivers/media/radio/radio-tea5761.c
+++ b/drivers/media/radio/radio-tea5761.c
@@ -1,7 +1,7 @@
 /*
  * drivers/media/radio/radio-tea5761.c
  *
- * Copyright (C) 2005 Nokia Corporation
+ * Copyright (C) 2005-2008 Nokia Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #define DRIVER_NAME "tea5761"
 
@@ -255,11 +256,12 @@ static int tea5761_do_ioctl(struct inode *inode, struct file *file,
 	case VIDIOC_QUERYCAP:
 		dev_dbg(&client->dev, "VIDIOC_QUERYCAP\n");
 		memset(&u->c, 0, sizeof(u->c));
-		strlcpy(u->c.driver, dev->dev->driver->name,
+		strlcpy(u->c.driver,
+			dev->parent->driver->name,
 			sizeof(u->c.driver));
 		strlcpy(u->c.card, dev->name, sizeof(u->c.card));
 		snprintf(u->c.bus_info, sizeof(u->c.bus_info), "I2C:%s",
-			 dev->dev->bus_id);
+			 dev->parent->bus_id);
 		u->c.version = TEA5761_VERSION;
 		u->c.capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
 		break;
@@ -406,9 +408,8 @@ static struct file_operations tea5761_fops = {
 };
 
 static struct video_device tea5761_video_device = {
-	.owner         = THIS_MODULE,
 	.name          = "TEA5761 FM-Radio",
-	.type          = VID_TYPE_TUNER,
+	.vfl_type      = VID_TYPE_TUNER,
 	.fops          = &tea5761_fops,
 	.release       = video_device_release
 };
@@ -434,7 +435,7 @@ static int tea5761_i2c_driver_probe(struct i2c_client *client,
 	tea->video_dev = video_dev;
 
 	*video_dev = tea5761_video_device;
-	video_dev->dev = &client->dev;
+	video_dev->parent = &client->dev;
 	i2c_set_clientdata(client, video_dev);
 
 	/* initialize and power off the chip */
-- 
1.5.5.1.357.g1af8b

[PATCH 2/2] Build fix for n800_defconfig

[Hiroshi DOYU]

Just updated from the latest header file.

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
---
 drivers/media/video/omap24xxcam.c |   67 +++++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 6793869..682d402 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2004 MontaVista Software, Inc.
  * Copyright (C) 2004 Texas Instruments.
- * Copyright (C) 2007 Nokia Corporation.
+ * Copyright (C) 2007-2008 Nokia Corporation.
  *
  * Contact: Sakari Ailus <sakari.ailus@nokia.com>
  *
@@ -997,8 +997,8 @@ static int vidioc_querycap(struct file *file, void *fh,
 	return 0;
 }
 
-static int vidioc_enum_fmt_cap(struct file *file, void *fh,
-			       struct v4l2_fmtdesc *f)
+static int vidioc_enum_fmt_vid_cap(struct file *file, void *fh,
+				   struct v4l2_fmtdesc *f)
 {
 	struct omap24xxcam_fh *ofh = fh;
 	struct omap24xxcam_device *cam = ofh->cam;
@@ -1009,8 +1009,8 @@ static int vidioc_enum_fmt_cap(struct file *file, void *fh,
 	return rval;
 }
 
-static int vidioc_g_fmt_cap(struct file *file, void *fh,
-			    struct v4l2_format *f)
+static int vidioc_g_fmt_vid_cap(struct file *file, void *fh,
+				struct v4l2_format *f)
 {
 	struct omap24xxcam_fh *ofh = fh;
 	struct omap24xxcam_device *cam = ofh->cam;
@@ -1023,8 +1023,8 @@ static int vidioc_g_fmt_cap(struct file *file, void *fh,
 	return rval;
 }
 
-static int vidioc_s_fmt_cap(struct file *file, void *fh,
-			    struct v4l2_format *f)
+static int vidioc_s_fmt_vid_cap(struct file *file, void *fh,
+				struct v4l2_format *f)
 {
 	struct omap24xxcam_fh *ofh = fh;
 	struct omap24xxcam_device *cam = ofh->cam;
@@ -1048,13 +1048,13 @@ out:
 	}
 
 	memset(f, 0, sizeof(*f));
-	vidioc_g_fmt_cap(file, fh, f);
+	vidioc_g_fmt_vid_cap(file, fh, f);
 
 	return rval;
 }
 
-static int vidioc_try_fmt_cap(struct file *file, void *fh,
-			      struct v4l2_format *f)
+static int vidioc_try_fmt_vid_cap(struct file *file, void *fh,
+				  struct v4l2_format *f)
 {
 	struct omap24xxcam_fh *ofh = fh;
 	struct omap24xxcam_device *cam = ofh->cam;
@@ -1608,6 +1608,28 @@ static int omap24xxcam_resume(struct platform_device *pdev)
 }
 #endif /* CONFIG_PM */
 
+static const struct v4l2_ioctl_ops omap24xxcam_ioctl_fops = {
+	.vidioc_querycap	= vidioc_querycap,
+	.vidioc_enum_fmt_vid_cap	= vidioc_enum_fmt_vid_cap,
+	.vidioc_g_fmt_vid_cap	= vidioc_g_fmt_vid_cap,
+	.vidioc_s_fmt_vid_cap	= vidioc_s_fmt_vid_cap,
+	.vidioc_try_fmt_vid_cap	= vidioc_try_fmt_vid_cap,
+	.vidioc_reqbufs		= vidioc_reqbufs,
+	.vidioc_querybuf	= vidioc_querybuf,
+	.vidioc_qbuf		= vidioc_qbuf,
+	.vidioc_dqbuf		= vidioc_dqbuf,
+	.vidioc_streamon	= vidioc_streamon,
+	.vidioc_streamoff	= vidioc_streamoff,
+	.vidioc_enum_input	= vidioc_enum_input,
+	.vidioc_g_input		= vidioc_g_input,
+	.vidioc_s_input		= vidioc_s_input,
+	.vidioc_queryctrl	= vidioc_queryctrl,
+	.vidioc_g_ctrl		= vidioc_g_ctrl,
+	.vidioc_s_ctrl		= vidioc_s_ctrl,
+	.vidioc_g_parm		= vidioc_g_parm,
+	.vidioc_s_parm		= vidioc_s_parm,
+};
+
 /*
  *
  * Camera device (i.e. /dev/video).
@@ -1641,33 +1663,14 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s)
 	}
 	vfd->release = video_device_release;
 
-	vfd->dev = cam->dev;
+	vfd->parent = cam->dev;
 
 	strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name));
-	vfd->type		 = VID_TYPE_CAPTURE | VID_TYPE_CHROMAKEY;
+	vfd->vfl_type		 = VID_TYPE_CAPTURE | VID_TYPE_CHROMAKEY;
 	vfd->fops		 = &omap24xxcam_fops;
 	vfd->priv		 = cam;
 	vfd->minor		 = -1;
-
-	vfd->vidioc_querycap	 = vidioc_querycap;
-	vfd->vidioc_enum_fmt_cap = vidioc_enum_fmt_cap;
-	vfd->vidioc_g_fmt_cap	 = vidioc_g_fmt_cap;
-	vfd->vidioc_s_fmt_cap	 = vidioc_s_fmt_cap;
-	vfd->vidioc_try_fmt_cap	 = vidioc_try_fmt_cap;
-	vfd->vidioc_reqbufs	 = vidioc_reqbufs;
-	vfd->vidioc_querybuf	 = vidioc_querybuf;
-	vfd->vidioc_qbuf	 = vidioc_qbuf;
-	vfd->vidioc_dqbuf	 = vidioc_dqbuf;
-	vfd->vidioc_streamon	 = vidioc_streamon;
-	vfd->vidioc_streamoff	 = vidioc_streamoff;
-	vfd->vidioc_enum_input	 = vidioc_enum_input;
-	vfd->vidioc_g_input	 = vidioc_g_input;
-	vfd->vidioc_s_input	 = vidioc_s_input;
-	vfd->vidioc_queryctrl	 = vidioc_queryctrl;
-	vfd->vidioc_g_ctrl	 = vidioc_g_ctrl;
-	vfd->vidioc_s_ctrl	 = vidioc_s_ctrl;
-	vfd->vidioc_g_parm	 = vidioc_g_parm;
-	vfd->vidioc_s_parm	 = vidioc_s_parm;
+	vfd->ioctl_ops		 = &omap24xxcam_ioctl_fops;
 
 	omap24xxcam_hwinit(cam);
 
-- 
1.5.5.1.357.g1af8b

Re: [PATCH 2/2] Build fix for n800_defconfig

[Sakari Ailus]

ext Hiroshi DOYU wrote:
> Just updated from the latest header file.
> 
> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
> ---
>  drivers/media/video/omap24xxcam.c |   67 +++++++++++++++++++-----------------
>  1 files changed, 35 insertions(+), 32 deletions(-)

Looks good to me. Thanks.

Regards,

-- 
Sakari Ailus
sakari.ailus@nokia.com

Re: [PATCH 2/2] Build fix for n800_defconfig

[Tony Lindgren]

* Sakari Ailus <sakari.ailus@nokia.com> [080812 13:19]:
> ext Hiroshi DOYU wrote:
>> Just updated from the latest header file.
>>
>> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
>> ---
>>  drivers/media/video/omap24xxcam.c |   67 +++++++++++++++++++-----------------
>>  1 files changed, 35 insertions(+), 32 deletions(-)
>
> Looks good to me. Thanks.

Pushing today.

Tony

>
> Regards,
>
> -- 
> Sakari Ailus
> sakari.ailus@nokia.com
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html