From patchwork Thu Aug 5 20:55:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 4094 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Thu, 05 Aug 2010 20:56:22 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Thu, 05 Aug 2010 18:01:08 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1Oh7UD-0007ma-RG; Thu, 05 Aug 2010 20:56:22 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934161Ab0HEUz7 (ORCPT + 1 other); Thu, 5 Aug 2010 16:55:59 -0400 Received: from mgw2.diku.dk ([130.225.96.92]:48371 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932935Ab0HEUz5 (ORCPT ); Thu, 5 Aug 2010 16:55:57 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id 1EA1B19BC29; Thu, 5 Aug 2010 22:55:57 +0200 (CEST) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 31405-08; Thu, 5 Aug 2010 22:55:56 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw2.diku.dk (Postfix) with ESMTP id 0E1EB19BC24; Thu, 5 Aug 2010 22:55:56 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 99A796DF893; Thu, 5 Aug 2010 22:54:46 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3767) id E2053200C3; Thu, 5 Aug 2010 22:55:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id D61C2200BD; Thu, 5 Aug 2010 22:55:55 +0200 (CEST) Date: Thu, 5 Aug 2010 22:55:55 +0200 (CEST) From: Julia Lawall To: Luca Tettamanti Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH 42/42] drivers/media/video/bt8xx: Adjust confusing if indentation In-Reply-To: Message-ID: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Julia Lawall Indent the branch of an if. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r disable braces4@ position p1,p2; statement S1,S2; @@ ( if (...) { ... } | if (...) S1@p1 S2@p2 ) @script:python@ p1 << r.p1; p2 << r.p2; @@ if (p1[0].column == p2[0].column): cocci.print_main("branch",p1) cocci.print_secs("after",p2) // Signed-off-by: Julia Lawall --- drivers/media/video/bt8xx/bttv-i2c.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/video/bt8xx/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c index 685d659..81d5b30 100644 --- a/drivers/media/video/bt8xx/bttv-i2c.c +++ b/drivers/media/video/bt8xx/bttv-i2c.c @@ -122,8 +122,7 @@ bttv_i2c_wait_done(struct bttv *btv) /* timeout */ if (wait_event_interruptible_timeout(btv->i2c_queue, btv->i2c_done, msecs_to_jiffies(85)) == -ERESTARTSYS) - - rc = -EIO; + rc = -EIO; if (btv->i2c_done & BT848_INT_RACK) rc = 1;