[04/20] media: saa7134: use semicolons rather than commas to separate statements
diff mbox series

Message ID 1601385283-26144-5-git-send-email-Julia.Lawall@inria.fr
State New, archived
Headers show
Series
  • media: use semicolons rather than commas to separate statements
Related show

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

Christophe JAILLET Sept. 29, 2020, 3:57 p.m. UTC | #1
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
Julia Lawall Sept. 29, 2020, 4:46 p.m. UTC | #2
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

Patch
diff mbox series

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)) {