Message ID | 1601385283-26144-5-git-send-email-Julia.Lawall@inria.fr (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Hans Verkuil |
Headers |
Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from <linux-media-owner@vger.kernel.org>) id 1kNG2T-00C4oC-Kt; Tue, 29 Sep 2020 13:51:30 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730900AbgI2N54 (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Tue, 29 Sep 2020 09:57:56 -0400 Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:47110 "EHLO mail2-relais-roc.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730501AbgI2N5v (ORCPT <rfc822;linux-media@vger.kernel.org>); Tue, 29 Sep 2020 09:57:51 -0400 X-IronPort-AV: E=Sophos;i="5.77,318,1596492000"; d="scan'208";a="470079950" Received: from palace.lip6.fr ([132.227.105.202]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/AES256-SHA256; 29 Sep 2020 15:57:40 +0200 From: Julia Lawall <Julia.Lawall@inria.fr> To: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: =?utf-8?q?Valdis_Kl=C4=93tnieks?= <valdis.kletnieks@vt.edu>, Joe Perches <joe@perches.com>, Thomas Gleixner <tglx@linutronix.de>, kernel-janitors@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/20] media: saa7134: use semicolons rather than commas to separate statements Date: Tue, 29 Sep 2020 15:14:27 +0200 Message-Id: <1601385283-26144-5-git-send-email-Julia.Lawall@inria.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1601385283-26144-1-git-send-email-Julia.Lawall@inria.fr> References: <1601385283-26144-1-git-send-email-Julia.Lawall@inria.fr> Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no |
Series |
media: use semicolons rather than commas to separate statements
|
|
Commit Message
Julia Lawall
Sept. 29, 2020, 1:14 p.m. UTC
Replace commas with semicolons. Commas introduce unnecessary
variability in the code structure and are hard to see. What is done
is essentially described by the following Coccinelle semantic patch
(http://coccinelle.lip6.fr/):
// <smpl>
@@ expression e1,e2; @@
e1
-,
+;
e2
... when any
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>
---
drivers/media/pci/saa7134/saa7134-video.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Comments
Le 29/09/2020 à 15:14, Julia Lawall a écrit : > Replace commas with semicolons. Commas introduce unnecessary > variability in the code structure and are hard to see. What is done > is essentially described by the following Coccinelle semantic patch > (http://coccinelle.lip6.fr/): > > // <smpl> > @@ expression e1,e2; @@ > e1 > -, > +; > e2 > ... when any > // </smpl> > > Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr> > > --- > drivers/media/pci/saa7134/saa7134-video.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c > index 9a6a6b68f8e3..2ca963b04b3f 100644 > --- a/drivers/media/pci/saa7134/saa7134-video.c > +++ b/drivers/media/pci/saa7134/saa7134-video.c > @@ -868,8 +868,11 @@ static int buffer_activate(struct saa7134_dev *dev, > lines_uv = dev->height >> dev->fmt->vshift; > base2 = base + bpl * dev->height; > base3 = base2 + bpl_uv * lines_uv; > - if (dev->fmt->uvswap) > - tmp = base2, base2 = base3, base3 = tmp; > + if (dev->fmt->uvswap) { > + tmp = base2; > + base2 = base3; > + base3 = tmp; > + } > video_dbg("uv: bpl=%ld lines=%ld base2/3=%ld/%ld\n", > bpl_uv,lines_uv,base2,base3); > if (V4L2_FIELD_HAS_BOTH(dev->field)) { > > Hi, this could be turned into a simpler: swap(base2, base3); CJ
On Tue, 29 Sep 2020, Christophe JAILLET wrote: > Le 29/09/2020 à 15:14, Julia Lawall a écrit : > > Replace commas with semicolons. Commas introduce unnecessary > > variability in the code structure and are hard to see. What is done > > is essentially described by the following Coccinelle semantic patch > > (http://coccinelle.lip6.fr/): > > > > // <smpl> > > @@ expression e1,e2; @@ > > e1 > > -, > > +; > > e2 > > ... when any > > // </smpl> > > > > Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr> > > > > --- > > drivers/media/pci/saa7134/saa7134-video.c | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/media/pci/saa7134/saa7134-video.c > > b/drivers/media/pci/saa7134/saa7134-video.c > > index 9a6a6b68f8e3..2ca963b04b3f 100644 > > --- a/drivers/media/pci/saa7134/saa7134-video.c > > +++ b/drivers/media/pci/saa7134/saa7134-video.c > > @@ -868,8 +868,11 @@ static int buffer_activate(struct saa7134_dev *dev, > > lines_uv = dev->height >> dev->fmt->vshift; > > base2 = base + bpl * dev->height; > > base3 = base2 + bpl_uv * lines_uv; > > - if (dev->fmt->uvswap) > > - tmp = base2, base2 = base3, base3 = tmp; > > + if (dev->fmt->uvswap) { > > + tmp = base2; > > + base2 = base3; > > + base3 = tmp; > > + } > > video_dbg("uv: bpl=%ld lines=%ld base2/3=%ld/%ld\n", > > bpl_uv,lines_uv,base2,base3); > > if (V4L2_FIELD_HAS_BOTH(dev->field)) { > > > > > Hi, > this could be turned into a simpler: > swap(base2, base3); Yes. The conclusion is probably that it could be worth searching for swap opportunities after this. There are a lot of patches to send on these commas, and I would rather not deviate to something else... julia
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c index 9a6a6b68f8e3..2ca963b04b3f 100644 --- a/drivers/media/pci/saa7134/saa7134-video.c +++ b/drivers/media/pci/saa7134/saa7134-video.c @@ -868,8 +868,11 @@ static int buffer_activate(struct saa7134_dev *dev, lines_uv = dev->height >> dev->fmt->vshift; base2 = base + bpl * dev->height; base3 = base2 + bpl_uv * lines_uv; - if (dev->fmt->uvswap) - tmp = base2, base2 = base3, base3 = tmp; + if (dev->fmt->uvswap) { + tmp = base2; + base2 = base3; + base3 = tmp; + } video_dbg("uv: bpl=%ld lines=%ld base2/3=%ld/%ld\n", bpl_uv,lines_uv,base2,base3); if (V4L2_FIELD_HAS_BOTH(dev->field)) {