From patchwork Tue Nov 10 19:21:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pete Eberlein X-Patchwork-Id: 59137 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAAJY6CE025621 for ; Tue, 10 Nov 2009 19:34:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757579AbZKJTeA (ORCPT ); Tue, 10 Nov 2009 14:34:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757876AbZKJTeA (ORCPT ); Tue, 10 Nov 2009 14:34:00 -0500 Received: from gateway04.websitewelcome.com ([64.5.52.7]:51725 "HELO gateway04.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754394AbZKJTd7 (ORCPT ); Tue, 10 Nov 2009 14:33:59 -0500 X-Greylist: delayed 389 seconds by postgrey-1.27 at vger.kernel.org; Tue, 10 Nov 2009 14:33:58 EST Received: (qmail 11597 invoked from network); 10 Nov 2009 19:42:13 -0000 Received: from gator886.hostgator.com (174.120.40.226) by gateway04.websitewelcome.com with SMTP; 10 Nov 2009 19:42:13 -0000 Received: from [66.15.212.169] (port=18701 helo=[10.140.5.16]) by gator886.hostgator.com with esmtpsa (SSLv3:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1N7wMz-0005tU-UF for linux-media@vger.kernel.org; Tue, 10 Nov 2009 13:27:15 -0600 Subject: [PATCH 1/5] go7007: Add struct v4l2_device. From: Pete Eberlein To: "linux-media@vger.kernel.org" Date: Tue, 10 Nov 2009 11:21:27 -0800 Message-Id: <1257880887.21307.1103.camel@pete-desktop> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator886.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - sensoray.com Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff -r 19c0469c02c3 -r a603ad1e6a1c linux/drivers/staging/go7007/go7007-driver.c --- a/linux/drivers/staging/go7007/go7007-driver.c Sat Nov 07 15:51:01 2009 -0200 +++ b/linux/drivers/staging/go7007/go7007-driver.c Tue Nov 10 10:41:56 2009 -0800 @@ -49,7 +49,7 @@ go->hpi_ops->read_interrupt(go); if (wait_event_timeout(go->interrupt_waitq, go->interrupt_available, 5*HZ) < 0) { - v4l2_err(go->video_dev, "timeout waiting for read interrupt\n"); + v4l2_err(&go->v4l2_dev, "timeout waiting for read interrupt\n"); return -1; } if (!go->interrupt_available) @@ -315,7 +315,7 @@ if (go7007_send_firmware(go, fw, fw_len) < 0 || go7007_read_interrupt(go, &intr_val, &intr_data) < 0) { - v4l2_err(go->video_dev, "error transferring firmware\n"); + v4l2_err(&go->v4l2_dev, "error transferring firmware\n"); rv = -1; goto start_error; } @@ -324,7 +324,7 @@ go->parse_length = 0; go->seen_frame = 0; if (go7007_stream_start(go) < 0) { - v4l2_err(go->video_dev, "error starting stream transfer\n"); + v4l2_err(&go->v4l2_dev, "error starting stream transfer\n"); rv = -1; goto start_error; } @@ -420,7 +420,7 @@ for (i = 0; i < length; ++i) { if (go->active_buf != NULL && go->active_buf->bytesused >= GO7007_BUF_SIZE - 3) { - v4l2_info(go->video_dev, "dropping oversized frame\n"); + v4l2_info(&go->v4l2_dev, "dropping oversized frame\n"); go->active_buf->offset -= go->active_buf->bytesused; go->active_buf->bytesused = 0; go->active_buf->modet_active = 0; @@ -668,7 +668,7 @@ if (i2c_del_adapter(&go->i2c_adapter) == 0) go->i2c_adapter_online = 0; else - v4l2_err(go->video_dev, + v4l2_err(&go->v4l2_dev, "error removing I2C adapter!\n"); } diff -r 19c0469c02c3 -r a603ad1e6a1c linux/drivers/staging/go7007/go7007-priv.h --- a/linux/drivers/staging/go7007/go7007-priv.h Sat Nov 07 15:51:01 2009 -0200 +++ b/linux/drivers/staging/go7007/go7007-priv.h Tue Nov 10 10:41:56 2009 -0800 @@ -21,6 +21,8 @@ * user-space applications. */ +#include + struct go7007; /* IDs to activate board-specific support code */ @@ -167,6 +169,7 @@ int channel_number; /* for multi-channel boards like Adlink PCI-MPG24 */ char name[64]; struct video_device *video_dev; + struct v4l2_device v4l2_dev; int ref_count; enum { STATUS_INIT, STATUS_ONLINE, STATUS_SHUTDOWN } status; spinlock_t spinlock; @@ -240,6 +243,11 @@ unsigned short interrupt_data; }; +static inline struct go7007 *to_go7007(struct v4l2_device *v4l2_dev) +{ + return container_of(v4l2_dev, struct go7007, v4l2_dev); +} + /* All of these must be called with the hpi_lock mutex held! */ #define go7007_interface_reset(go) \ ((go)->hpi_ops->interface_reset(go)) diff -r 19c0469c02c3 -r a603ad1e6a1c linux/drivers/staging/go7007/go7007-usb.c --- a/linux/drivers/staging/go7007/go7007-usb.c Sat Nov 07 15:51:01 2009 -0200 +++ b/linux/drivers/staging/go7007/go7007-usb.c Tue Nov 10 10:41:56 2009 -0800 @@ -1057,7 +1057,7 @@ usb_rcvintpipe(usb->usbdev, 4), usb->intr_urb->transfer_buffer, 2*sizeof(u16), go7007_usb_readinterrupt_complete, go, 8); - usb_set_intfdata(intf, go); + usb_set_intfdata(intf, &go->v4l2_dev); /* Boot the GO7007 */ if (go7007_boot_encoder(go, go->board_info->flags & @@ -1233,7 +1233,7 @@ static void go7007_usb_disconnect(struct usb_interface *intf) { - struct go7007 *go = usb_get_intfdata(intf); + struct go7007 *go = to_go7007(usb_get_intfdata(intf)); struct go7007_usb *usb = go->hpi_context; struct urb *vurb, *aurb; int i; diff -r 19c0469c02c3 -r a603ad1e6a1c linux/drivers/staging/go7007/go7007-v4l2.c --- a/linux/drivers/staging/go7007/go7007-v4l2.c Sat Nov 07 15:51:01 2009 -0200 +++ b/linux/drivers/staging/go7007/go7007-v4l2.c Tue Nov 10 10:41:56 2009 -0800 @@ -1827,7 +1827,7 @@ go->video_dev = video_device_alloc(); if (go->video_dev == NULL) return -ENOMEM; - memcpy(go->video_dev, &go7007_template, sizeof(go7007_template)); + *go->video_dev = go7007_template; go->video_dev->parent = go->dev; rv = video_register_device(go->video_dev, VFL_TYPE_GRABBER, -1); if (rv < 0) { @@ -1837,6 +1837,8 @@ } video_set_drvdata(go->video_dev, go); ++go->ref_count; + v4l2_device_register(go->dev, &go->v4l2_dev); + printk(KERN_INFO "%s: registered device video%d [v4l2]\n", go->video_dev->name, go->video_dev->num); @@ -1858,4 +1860,5 @@ mutex_unlock(&go->hw_lock); if (go->video_dev) video_unregister_device(go->video_dev); + v4l2_device_unregister(&go->v4l2_dev); }