Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760194AbXIMW0I (ORCPT ); Thu, 13 Sep 2007 18:26:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753227AbXIMWZ4 (ORCPT ); Thu, 13 Sep 2007 18:25:56 -0400 Received: from mail-in-06.arcor-online.net ([151.189.21.46]:55139 "EHLO mail-in-06.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752618AbXIMWZ4 (ORCPT ); Thu, 13 Sep 2007 18:25:56 -0400 Date: Fri, 14 Sep 2007 00:27:17 +0200 From: Andreas Herrmann To: Linus Torvalds Cc: akpm@linux-foundation.org, linux-usb-devel@lists.sourceforge.net, video4linux-list@redhat.com, linux-kernel@vger.kernel.org, Luca Risolia Subject: [PATCH] v4l: fix build error for et61x251 driver Message-ID: <20070913222717.GC5764@devil> References: <20070913123627.GD10348@devil> <200709131707.16666.luca.risolia@studio.unibo.it> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200709131707.16666.luca.risolia@studio.unibo.it> User-Agent: mutt-ng/devel-r804 (Linux) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4158 Lines: 117 This fixes a kernel build problem and should make it into 2.6.23, I think. Regards, Andreas -- Get rid of some v4l1 remainders to avoid kernel build errors if V4L1_COMPAT is not selected: drivers/media/video/et61x251/et61x251_core.c: In et61x251_show_: drivers/media/video/et61x251/et61x251_core.c:718: error: implicit declaration of to_video_device Fix as suggested by Luca Risolia Signed-off-by: Andreas Herrmann --- drivers/media/video/et61x251/et61x251_core.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index 585bd1f..a3ee968 100644 --- a/drivers/media/video/et61x251/et61x251_core.c +++ b/drivers/media/video/et61x251/et61x251_core.c @@ -715,7 +715,8 @@ static ssize_t et61x251_show_reg(struct class_device* cd, char* buf) if (mutex_lock_interruptible(&et61x251_sysfs_lock)) return -ERESTARTSYS; - cam = video_get_drvdata(to_video_device(cd)); + cam = video_get_drvdata(container_of(cd, struct video_device, + class_dev)); if (!cam) { mutex_unlock(&et61x251_sysfs_lock); return -ENODEV; @@ -739,7 +740,8 @@ et61x251_store_reg(struct class_device* cd, const char* buf, size_t len) if (mutex_lock_interruptible(&et61x251_sysfs_lock)) return -ERESTARTSYS; - cam = video_get_drvdata(to_video_device(cd)); + cam = video_get_drvdata(container_of(cd, struct video_device, + class_dev)); if (!cam) { mutex_unlock(&et61x251_sysfs_lock); return -ENODEV; @@ -771,7 +773,8 @@ static ssize_t et61x251_show_val(struct class_device* cd, char* buf) if (mutex_lock_interruptible(&et61x251_sysfs_lock)) return -ERESTARTSYS; - cam = video_get_drvdata(to_video_device(cd)); + cam = video_get_drvdata(container_of(cd, struct video_device, + class_dev)); if (!cam) { mutex_unlock(&et61x251_sysfs_lock); return -ENODEV; @@ -803,7 +806,8 @@ et61x251_store_val(struct class_device* cd, const char* buf, size_t len) if (mutex_lock_interruptible(&et61x251_sysfs_lock)) return -ERESTARTSYS; - cam = video_get_drvdata(to_video_device(cd)); + cam = video_get_drvdata(container_of(cd, struct video_device, + class_dev)); if (!cam) { mutex_unlock(&et61x251_sysfs_lock); return -ENODEV; @@ -839,7 +843,8 @@ static ssize_t et61x251_show_i2c_reg(struct class_device* cd, char* buf) if (mutex_lock_interruptible(&et61x251_sysfs_lock)) return -ERESTARTSYS; - cam = video_get_drvdata(to_video_device(cd)); + cam = video_get_drvdata(container_of(cd, struct video_device, + class_dev)); if (!cam) { mutex_unlock(&et61x251_sysfs_lock); return -ENODEV; @@ -865,7 +870,8 @@ et61x251_store_i2c_reg(struct class_device* cd, const char* buf, size_t len) if (mutex_lock_interruptible(&et61x251_sysfs_lock)) return -ERESTARTSYS; - cam = video_get_drvdata(to_video_device(cd)); + cam = video_get_drvdata(container_of(cd, struct video_device, + class_dev)); if (!cam) { mutex_unlock(&et61x251_sysfs_lock); return -ENODEV; @@ -897,7 +903,8 @@ static ssize_t et61x251_show_i2c_val(struct class_device* cd, char* buf) if (mutex_lock_interruptible(&et61x251_sysfs_lock)) return -ERESTARTSYS; - cam = video_get_drvdata(to_video_device(cd)); + cam = video_get_drvdata(container_of(cd, struct video_device, + class_dev)); if (!cam) { mutex_unlock(&et61x251_sysfs_lock); return -ENODEV; @@ -934,7 +941,8 @@ et61x251_store_i2c_val(struct class_device* cd, const char* buf, size_t len) if (mutex_lock_interruptible(&et61x251_sysfs_lock)) return -ERESTARTSYS; - cam = video_get_drvdata(to_video_device(cd)); + cam = video_get_drvdata(container_of(cd, struct video_device, + class_dev)); if (!cam) { mutex_unlock(&et61x251_sysfs_lock); return -ENODEV; -- 1.5.3 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/