From patchwork Thu May 5 12:42:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Farnsworth X-Patchwork-Id: 757052 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p45CgtBY005835 for ; Thu, 5 May 2011 12:42:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754139Ab1EEMmo (ORCPT ); Thu, 5 May 2011 08:42:44 -0400 Received: from claranet-outbound-smtp00.uk.clara.net ([195.8.89.33]:46156 "EHLO claranet-outbound-smtp00.uk.clara.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754127Ab1EEMmn (ORCPT ); Thu, 5 May 2011 08:42:43 -0400 Received: from 110.100.155.90.in-addr.arpa ([90.155.100.110]:58216 helo=f12simon.office.onelan.co.uk) by relay00.mail.eu.clara.net (relay.clara.net [213.253.3.40]:1025) with esmtpa (authdaemon_plain:simon.farnsworth@onelan.co.uk) id 1QHxt8-0001no-0X (return-path ); Thu, 05 May 2011 12:42:38 +0000 From: Simon Farnsworth To: Mauro Carvalho Chehab Cc: Andy Walls , Hans Verkuil , linux-media@vger.kernel.org, Steven Toth , Simon Farnsworth Subject: [PATCH] cx18: Fix warnings introduced during cleanup Date: Thu, 5 May 2011 13:42:36 +0100 Message-Id: <1304599356-21951-1-git-send-email-simon.farnsworth@onelan.co.uk> X-Mailer: git-send-email 1.7.4 In-Reply-To: <4DC138F7.5050400@infradead.org> References: <4DC138F7.5050400@infradead.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 05 May 2011 12:42:55 +0000 (UTC) I misused the ktime API, and failed to remove some traces of the in-kernel format conversion. Fix these, so the the driver builds without warnings. Signed-off-by: Simon Farnsworth --- Mauro, You may want to squash this in with the cleanup patch itself - it's plain and simple oversight on my part (I should have seen the compiler warnings), and I should not have sent the cleanup patch to you without fixing these errors. Sorry, Simon drivers/media/video/cx18/cx18-mailbox.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c index 5ecae93..c07191e 100644 --- a/drivers/media/video/cx18/cx18-mailbox.c +++ b/drivers/media/video/cx18/cx18-mailbox.c @@ -164,10 +164,9 @@ static void cx18_mdl_send_to_videobuf(struct cx18_stream *s, { struct cx18_videobuf_buffer *vb_buf; struct cx18_buffer *buf; - u8 *p, u; + u8 *p; u32 offset = 0; int dispatch = 0; - int i; if (mdl->bytesused == 0) return; @@ -203,7 +202,7 @@ static void cx18_mdl_send_to_videobuf(struct cx18_stream *s, } if (dispatch) { - ktime_get_ts(&vb_buf->vb.ts); + vb_buf->vb.ts = ktime_to_timeval(ktime_get()); list_del(&vb_buf->vb.queue); vb_buf->vb.state = VIDEOBUF_DONE; wake_up(&vb_buf->vb.done);