From patchwork Sat Oct 23 03:25:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 278781 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9N3Puvb008686 for ; Sat, 23 Oct 2010 03:25:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755695Ab0JWDZx (ORCPT ); Fri, 22 Oct 2010 23:25:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26073 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755441Ab0JWDZx (ORCPT ); Fri, 22 Oct 2010 23:25:53 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9N3PqPK023894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 22 Oct 2010 23:25:52 -0400 Received: from [10.3.227.40] (vpn-227-40.phx2.redhat.com [10.3.227.40]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9N3PpLN001607 for ; Fri, 22 Oct 2010 23:25:51 -0400 Message-ID: <4CC255BE.8030001@redhat.com> Date: Sat, 23 Oct 2010 01:25:50 -0200 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100827 Red Hat/3.1.3-1.el6 Lightning/1.0b2 Thunderbird/3.1.3 MIME-Version: 1.0 To: "linux-med >> Linux Media Mailing List" Subject: [PATCH] tm6000: Remove some ugly debug code X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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.3 (demeter1.kernel.org [140.211.167.41]); Sat, 23 Oct 2010 03:25:59 +0000 (UTC) diff --git a/drivers/media/IR/mceusb.c b/drivers/media/IR/mceusb.c index 9dce684..e34efac 100644 --- a/drivers/media/IR/mceusb.c +++ b/drivers/media/IR/mceusb.c @@ -812,8 +812,7 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len) ir->rawir.duration = rawir.duration; ir->rawir.pulse = rawir.pulse; } - if (ir->rem) - break; + break; } rawir.duration += ir->rawir.duration; ir->rawir.duration = 0; diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c index 9b45101..0883ea5 100644 --- a/drivers/staging/tm6000/tm6000-core.c +++ b/drivers/staging/tm6000/tm6000-core.c @@ -37,7 +37,6 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req, { int ret, i; unsigned int pipe; - static int ini = 0, last = 0, n = 0; u8 *data = NULL; if (len) @@ -52,19 +51,12 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req, } if (tm6000_debug & V4L2_DEBUG_I2C) { - if (!ini) - last = ini = jiffies; + printk("(dev %p, pipe %08x): ", dev->udev, pipe); - printk("%06i (dev %p, pipe %08x): ", n, dev->udev, pipe); - - printk("%s: %06u ms %06u ms %02x %02x %02x %02x %02x %02x %02x %02x ", + printk("%s: %02x %02x %02x %02x %02x %02x %02x %02x ", (req_type & USB_DIR_IN) ? " IN" : "OUT", - jiffies_to_msecs(jiffies-last), - jiffies_to_msecs(jiffies-ini), req_type, req, value&0xff, value>>8, index&0xff, index>>8, len&0xff, len>>8); - last = jiffies; - n++; if (!(req_type & USB_DIR_IN)) { printk(">>> ");